Skip to content

Commit cb407c4

Browse files
authored
Merge pull request #10493 from AA-Turner/more-css
Add `aside.topic` for Docutils 0.18+
2 parents d6d2a40 + 6755290 commit cb407c4

File tree

11 files changed

+40
-27
lines changed

11 files changed

+40
-27
lines changed

sphinx/themes/agogo/static/agogo.css_t

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ div.document ol {
271271

272272
/* Sidebar */
273273

274-
div.sidebar {
274+
div.sidebar,
275+
aside.sidebar {
275276
width: {{ theme_sidebarwidth|todim }};
276277
{%- if theme_rightsidebar|tobool %}
277278
float: right;
@@ -281,26 +282,29 @@ div.sidebar {
281282
font-size: .9em;
282283
}
283284

284-
div.sidebar a, div.header a {
285+
div.sidebar a, aside.sidebar a, div.header a {
285286
text-decoration: none;
286287
}
287288

288-
div.sidebar a:hover, div.header a:hover {
289+
div.sidebar a:hover, aside.sidebar a:hover, div.header a:hover {
289290
text-decoration: underline;
290291
}
291292

292-
div.sidebar h3 {
293+
div.sidebar h3,
294+
aside.sidebar h3 {
293295
color: #2e3436;
294296
text-transform: uppercase;
295297
font-size: 130%;
296298
letter-spacing: .1em;
297299
}
298300

299-
div.sidebar ul {
301+
div.sidebar ul,
302+
aside.sidebar ul {
300303
list-style-type: none;
301304
}
302305

303-
div.sidebar li.toctree-l1 a {
306+
div.sidebar li.toctree-l1 a,
307+
aside.sidebar li.toctree-l1 a {
304308
display: block;
305309
padding: 1px;
306310
border: 1px solid #dddddd;
@@ -310,37 +314,44 @@ div.sidebar li.toctree-l1 a {
310314
color: #2e3436;
311315
}
312316

313-
div.sidebar li.toctree-l2 a {
317+
div.sidebar li.toctree-l2 a,
318+
aside.sidebar li.toctree-l2 a {
314319
background-color: transparent;
315320
border: none;
316321
margin-left: 1em;
317322
border-bottom: 1px solid #dddddd;
318323
}
319324

320-
div.sidebar li.toctree-l3 a {
325+
div.sidebar li.toctree-l3 a,
326+
aside.sidebar li.toctree-l3 a {
321327
background-color: transparent;
322328
border: none;
323329
margin-left: 2em;
324330
border-bottom: 1px solid #dddddd;
325331
}
326332

327-
div.sidebar li.toctree-l2:last-child a {
333+
div.sidebar li.toctree-l2:last-child a,
334+
aside.sidebar li.toctree-l2:last-child a {
328335
border-bottom: none;
329336
}
330337

331-
div.sidebar li.toctree-l1.current a {
338+
div.sidebar li.toctree-l1.current a,
339+
aside.sidebar li.toctree-l1.current a {
332340
border-right: 5px solid {{ theme_headerlinkcolor }};
333341
}
334342

335-
div.sidebar li.toctree-l1.current li.toctree-l2 a {
343+
div.sidebar li.toctree-l1.current li.toctree-l2 a,
344+
aside.sidebar li.toctree-l1.current li.toctree-l2 a {
336345
border-right: none;
337346
}
338347

339-
div.sidebar input[type="text"] {
348+
div.sidebar input[type="text"],
349+
aside.sidebar input[type="text"] {
340350
width: 170px;
341351
}
342352

343-
div.sidebar input[type="submit"] {
353+
div.sidebar input[type="submit"],
354+
aside.sidebar input[type="submit"] {
344355
width: 30px;
345356
}
346357

sphinx/themes/basic/static/basic.css_t

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,13 @@ p.sidebar-title {
335335
font-weight: bold;
336336
}
337337

338-
div.admonition, div.topic, blockquote {
338+
div.admonition, div.topic, aside.topic, blockquote {
339339
clear: left;
340340
}
341341

342342
/* -- topics ---------------------------------------------------------------- */
343343

344-
div.topic {
344+
div.topic, aside.topic {
345345
border: 1px solid #ccc;
346346
padding: 7px;
347347
margin: 10px 0 10px 0;
@@ -380,13 +380,15 @@ div.body p.centered {
380380
div.sidebar > :last-child,
381381
aside.sidebar > :last-child,
382382
div.topic > :last-child,
383+
aside.topic > :last-child,
383384
div.admonition > :last-child {
384385
margin-bottom: 0;
385386
}
386387

387388
div.sidebar::after,
388389
aside.sidebar::after,
389390
div.topic::after,
391+
aside.topic::after,
390392
div.admonition::after,
391393
blockquote::after {
392394
display: block;

sphinx/themes/bizstyle/static/bizstyle.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ div.quotebar {
306306
border: 1px solid #ccc;
307307
}
308308

309-
div.topic {
309+
div.topic, aside.topic {
310310
background-color: #f8f8f8;
311311
}
312312

sphinx/themes/classic/static/classic.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ div.seealso {
290290
border: 1px solid #ff6;
291291
}
292292

293-
div.topic {
293+
div.topic, aside.topic {
294294
background-color: #eee;
295295
}
296296

sphinx/themes/epub/static/epub.css_t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ p.rubric {
230230

231231
/* -- sidebars -------------------------------------------------------------- */
232232

233-
div.sidebar {
233+
div.sidebar, aside.sidebar {
234234
margin: 0 0 0.5em 1em;
235235
border: 1px solid #ddb;
236236
padding: 7px 7px 0 7px;
@@ -245,7 +245,7 @@ p.sidebar-title {
245245

246246
/* -- topics ---------------------------------------------------------------- */
247247

248-
div.topic {
248+
div.topic, aside.topic {
249249
border: 1px solid #ccc;
250250
padding: 7px 7px 0 7px;
251251
margin: 10px 0 10px 0;

sphinx/themes/nature/static/nature.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ div.seealso {
194194
border: 1px solid #ff6;
195195
}
196196

197-
div.topic {
197+
div.topic, aside.topic {
198198
background-color: #eee;
199199
}
200200

sphinx/themes/nonav/static/nonav.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ p.rubric {
219219

220220
/* -- sidebars -------------------------------------------------------------- */
221221

222-
div.sidebar {
222+
div.sidebar, aside.sidebar {
223223
margin: 0 0 0.5em 1em;
224224
border: 1px solid #ddb;
225225
padding: 7px 7px 0 7px;
@@ -234,7 +234,7 @@ p.sidebar-title {
234234

235235
/* -- topics ---------------------------------------------------------------- */
236236

237-
div.topic {
237+
div.topic, aside.topic {
238238
border: 1px solid #ccc;
239239
padding: 7px 7px 0 7px;
240240
margin: 10px 0 10px 0;

sphinx/themes/pyramid/static/epub.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ div.seealso {
254254
border: 1px solid #ff6;
255255
}
256256

257-
div.topic {
257+
div.topic, aside.topic {
258258
background-color: #eee;
259259
}
260260

sphinx/themes/pyramid/static/pyramid.css_t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ div.sphinxsidebar .searchformwrapper {
155155

156156
/* -- sidebars -------------------------------------------------------------- */
157157

158-
div.sidebar {
158+
div.sidebar, aside.sidebar {
159159
margin: 0 0 0.5em 1em;
160160
border: 2px solid #c6d880;
161161
background-color: #e6efc2;
@@ -245,7 +245,7 @@ div.seealso {
245245
padding: 10px 20px 10px 60px;
246246
}
247247

248-
div.topic {
248+
div.topic, aside.topic {
249249
background: #eeeeee;
250250
border: 2px solid #C6C9CB;
251251
padding: 10px 20px;

sphinx/themes/sphinxdoc/static/sphinxdoc.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ div.quotebar {
266266
border: 1px solid #ccc;
267267
}
268268

269-
div.topic {
269+
div.topic, aside.topic {
270270
background-color: #f8f8f8;
271271
}
272272

sphinx/themes/traditional/static/traditional.css_t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ p.rubric {
506506

507507
/* "Topics" */
508508

509-
div.topic {
509+
div.topic, aside.topic {
510510
background-color: #eee;
511511
border: 1px solid #ccc;
512512
padding: 0 7px 0 7px;

0 commit comments

Comments
 (0)