Skip to content

Commit

Permalink
Merge pull request #10493 from AA-Turner/more-css
Browse files Browse the repository at this point in the history
Add `aside.topic` for Docutils 0.18+
  • Loading branch information
tk0miya committed Jun 2, 2022
2 parents d6d2a40 + 6755290 commit cb407c4
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 27 deletions.
37 changes: 24 additions & 13 deletions sphinx/themes/agogo/static/agogo.css_t
Expand Up @@ -271,7 +271,8 @@ div.document ol {

/* Sidebar */

div.sidebar {
div.sidebar,
aside.sidebar {
width: {{ theme_sidebarwidth|todim }};
{%- if theme_rightsidebar|tobool %}
float: right;
Expand All @@ -281,26 +282,29 @@ div.sidebar {
font-size: .9em;
}

div.sidebar a, div.header a {
div.sidebar a, aside.sidebar a, div.header a {
text-decoration: none;
}

div.sidebar a:hover, div.header a:hover {
div.sidebar a:hover, aside.sidebar a:hover, div.header a:hover {
text-decoration: underline;
}

div.sidebar h3 {
div.sidebar h3,
aside.sidebar h3 {
color: #2e3436;
text-transform: uppercase;
font-size: 130%;
letter-spacing: .1em;
}

div.sidebar ul {
div.sidebar ul,
aside.sidebar ul {
list-style-type: none;
}

div.sidebar li.toctree-l1 a {
div.sidebar li.toctree-l1 a,
aside.sidebar li.toctree-l1 a {
display: block;
padding: 1px;
border: 1px solid #dddddd;
Expand All @@ -310,37 +314,44 @@ div.sidebar li.toctree-l1 a {
color: #2e3436;
}

div.sidebar li.toctree-l2 a {
div.sidebar li.toctree-l2 a,
aside.sidebar li.toctree-l2 a {
background-color: transparent;
border: none;
margin-left: 1em;
border-bottom: 1px solid #dddddd;
}

div.sidebar li.toctree-l3 a {
div.sidebar li.toctree-l3 a,
aside.sidebar li.toctree-l3 a {
background-color: transparent;
border: none;
margin-left: 2em;
border-bottom: 1px solid #dddddd;
}

div.sidebar li.toctree-l2:last-child a {
div.sidebar li.toctree-l2:last-child a,
aside.sidebar li.toctree-l2:last-child a {
border-bottom: none;
}

div.sidebar li.toctree-l1.current a {
div.sidebar li.toctree-l1.current a,
aside.sidebar li.toctree-l1.current a {
border-right: 5px solid {{ theme_headerlinkcolor }};
}

div.sidebar li.toctree-l1.current li.toctree-l2 a {
div.sidebar li.toctree-l1.current li.toctree-l2 a,
aside.sidebar li.toctree-l1.current li.toctree-l2 a {
border-right: none;
}

div.sidebar input[type="text"] {
div.sidebar input[type="text"],
aside.sidebar input[type="text"] {
width: 170px;
}

div.sidebar input[type="submit"] {
div.sidebar input[type="submit"],
aside.sidebar input[type="submit"] {
width: 30px;
}

Expand Down
6 changes: 4 additions & 2 deletions sphinx/themes/basic/static/basic.css_t
Expand Up @@ -335,13 +335,13 @@ p.sidebar-title {
font-weight: bold;
}

div.admonition, div.topic, blockquote {
div.admonition, div.topic, aside.topic, blockquote {
clear: left;
}

/* -- topics ---------------------------------------------------------------- */

div.topic {
div.topic, aside.topic {
border: 1px solid #ccc;
padding: 7px;
margin: 10px 0 10px 0;
Expand Down Expand Up @@ -380,13 +380,15 @@ div.body p.centered {
div.sidebar > :last-child,
aside.sidebar > :last-child,
div.topic > :last-child,
aside.topic > :last-child,
div.admonition > :last-child {
margin-bottom: 0;
}

div.sidebar::after,
aside.sidebar::after,
div.topic::after,
aside.topic::after,
div.admonition::after,
blockquote::after {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/bizstyle/static/bizstyle.css_t
Expand Up @@ -306,7 +306,7 @@ div.quotebar {
border: 1px solid #ccc;
}

div.topic {
div.topic, aside.topic {
background-color: #f8f8f8;
}

Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/classic/static/classic.css_t
Expand Up @@ -290,7 +290,7 @@ div.seealso {
border: 1px solid #ff6;
}

div.topic {
div.topic, aside.topic {
background-color: #eee;
}

Expand Down
4 changes: 2 additions & 2 deletions sphinx/themes/epub/static/epub.css_t
Expand Up @@ -230,7 +230,7 @@ p.rubric {

/* -- sidebars -------------------------------------------------------------- */

div.sidebar {
div.sidebar, aside.sidebar {
margin: 0 0 0.5em 1em;
border: 1px solid #ddb;
padding: 7px 7px 0 7px;
Expand All @@ -245,7 +245,7 @@ p.sidebar-title {

/* -- topics ---------------------------------------------------------------- */

div.topic {
div.topic, aside.topic {
border: 1px solid #ccc;
padding: 7px 7px 0 7px;
margin: 10px 0 10px 0;
Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/nature/static/nature.css_t
Expand Up @@ -194,7 +194,7 @@ div.seealso {
border: 1px solid #ff6;
}

div.topic {
div.topic, aside.topic {
background-color: #eee;
}

Expand Down
4 changes: 2 additions & 2 deletions sphinx/themes/nonav/static/nonav.css
Expand Up @@ -219,7 +219,7 @@ p.rubric {

/* -- sidebars -------------------------------------------------------------- */

div.sidebar {
div.sidebar, aside.sidebar {
margin: 0 0 0.5em 1em;
border: 1px solid #ddb;
padding: 7px 7px 0 7px;
Expand All @@ -234,7 +234,7 @@ p.sidebar-title {

/* -- topics ---------------------------------------------------------------- */

div.topic {
div.topic, aside.topic {
border: 1px solid #ccc;
padding: 7px 7px 0 7px;
margin: 10px 0 10px 0;
Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/pyramid/static/epub.css
Expand Up @@ -254,7 +254,7 @@ div.seealso {
border: 1px solid #ff6;
}

div.topic {
div.topic, aside.topic {
background-color: #eee;
}

Expand Down
4 changes: 2 additions & 2 deletions sphinx/themes/pyramid/static/pyramid.css_t
Expand Up @@ -155,7 +155,7 @@ div.sphinxsidebar .searchformwrapper {

/* -- sidebars -------------------------------------------------------------- */

div.sidebar {
div.sidebar, aside.sidebar {
margin: 0 0 0.5em 1em;
border: 2px solid #c6d880;
background-color: #e6efc2;
Expand Down Expand Up @@ -245,7 +245,7 @@ div.seealso {
padding: 10px 20px 10px 60px;
}

div.topic {
div.topic, aside.topic {
background: #eeeeee;
border: 2px solid #C6C9CB;
padding: 10px 20px;
Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/sphinxdoc/static/sphinxdoc.css_t
Expand Up @@ -266,7 +266,7 @@ div.quotebar {
border: 1px solid #ccc;
}

div.topic {
div.topic, aside.topic {
background-color: #f8f8f8;
}

Expand Down
2 changes: 1 addition & 1 deletion sphinx/themes/traditional/static/traditional.css_t
Expand Up @@ -506,7 +506,7 @@ p.rubric {

/* "Topics" */

div.topic {
div.topic, aside.topic {
background-color: #eee;
border: 1px solid #ccc;
padding: 0 7px 0 7px;
Expand Down

0 comments on commit cb407c4

Please sign in to comment.