From 1f3c248d6e3cd0ce2d7f9bfe7f476bd2966ca65c Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sun, 27 May 2018 18:37:19 +0200 Subject: [PATCH 1/5] update CSS of admonitions --- doc/_static/mpl.css | 130 +++++++++++++++++++++++-------------------- doc/api/axes_api.rst | 1 + 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 0417be90549d..d31493ed530a 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -395,101 +395,115 @@ div.sphinxsidebar ul.toc ul li { padding: 0; } -div.admonition, div.warning { - font-size: 0.9em; +/* admonitions */ + +div.admonition, div.deprecated { + margin: 10px 0px; + padding: 0.7em 1.4em; + border-left: 5px solid; + } + +div.note { + background-color: #eee; + border-color: #ccc; } +div.seealso { + background-color: #EAF1F7; + border-color: #8EADCC; + color: #3F5E7F; + } + div.warning { - color: #b94a48; background-color: #F3E5E5; - border: 1px solid #eed3d7; + border-color: #CC8E8E; + color: #7F1919; } div.deprecated { - color: #606060; background-color: #f0f0f0; - border: 1px solid #404040; + border-color: #404040; + color: #606060; } div.deprecated span.versionmodified { - color: #606060; font-weight: bold; } div.green, div.hint { - color: #468847; - background-color: #dff0d8; - border: 1px solid #d6e9c6; -} - -div.admonition p, div.warning p, div.deprecated p { - margin: 0.5em 1em 0.5em 1em; - padding: 0; + background-color: #E1F2DA; + border-color: #A1CC8E; + color: #3F7F3F; } -div.admonition pre, div.warning pre { - margin: 0.4em 1em 0.4em 1em; +div.admonition p.admonition-title { + font-size: 1.2em; + font-weight: bold; } -div.admonition p.admonition-title + p { - display: inline; +div.admonition p, div.deprecated p { + margin: 0.6em 0; + padding: 0; } - -div.admonition p.admonition-title, -div.warning p.admonition-title { - margin: 0; - font-weight: bold; - font-size: 14px; +div.admonition pre { + margin: 0.6em 0; } -div.admonition, div.deprecated { - margin-bottom: 10px; - margin-top: 10px; - padding: 7px; - border-radius: 4px; - -moz-border-radius: 4px; - } - -div.note { - background-color: #eee; - border: 1px solid #ccc; +div.admonition ul, div.admonition ol { + margin: 0.1em 0.5em 0.5em 2em; + padding: 0; } div.topic { - background-color: #eee; - border: 1px solid #CCC; + background-color: #f4f4f4; + border: 2px solid #ccc; + border-left: 0px; + border-right: 0px; margin: 10px 0px; - padding: 7px 7px 0px; - border-radius: 4px; - -moz-border-radius: 4px; + padding: 1em 1.4em; } p.topic-title { - font-size: 1.1em; + font-size: 1.2em; font-weight: bold; } -div.seealso { - background-color: #FFFBE8; - border: 1px solid #fbeed5; - color: #AF8A4B; - } +.contents ul { + list-style-type: none; + padding-left: 2em; +} -div.warning { - border: 1px solid #940000; +/* first level */ +.contents > ul { + padding-left: 0; } -div.warning p.admonition-title { - border-bottom-color: #940000; +.multicol-toc > ul { + column-width: 250px; + column-gap: 60px; + -webkit-column-width: 250px; + -moz-column-width: 250px; + column-rule: 1px solid #ccc; } -div.admonition ul, div.admonition ol, -div.warning ul, div.warning ol { - margin: 0.1em 0.5em 0.5em 3em; - padding: 0; +.multicol-toc > li { + /* break inside is not yet broadly supported, but we just try */ + break-inside: avoid-column; + -moz-break-inside: avoid-column; + -webkit-break-inside: avoid-column; +} + +.contents > ul > li { + padding-top: 0.7em; } +.contents > ul > li > a { + font-size: 1.0em; +} + + + div.versioninfo { margin: 1em 0 0 0; border: 1px solid #ccc; @@ -499,7 +513,6 @@ div.versioninfo { font-size: 0.9em; } - a.headerlink { color: #c60f0f!important; font-size: 1em; @@ -721,11 +734,6 @@ p.rubric { font-size: 19px; margin: 15px 0 10px 0; } -p.admonition-title { - font-weight: bold; - text-decoration: underline; -} - #matplotlib-examples ul li{ font-size: large; diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst index cfa3231b3593..42f7e23f7074 100644 --- a/doc/api/axes_api.rst +++ b/doc/api/axes_api.rst @@ -11,6 +11,7 @@ :depth: 2 :local: :backlinks: entry + :class: multicol-toc Plotting From c3d012bce8f2d0f86aa65c36e640d70a9e2299c5 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sun, 27 May 2018 20:09:48 +0200 Subject: [PATCH 2/5] update CSS of versionmodified --- doc/_static/mpl.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index d31493ed530a..836237d757f5 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -426,8 +426,13 @@ div.deprecated { color: #606060; } +span.versionmodified { + font-style: italic; +} + div.deprecated span.versionmodified { font-weight: bold; + font-style: normal; } div.green, div.hint { From 271836dd510da2f107bdcd9671c0d270c261e838 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sun, 10 Jun 2018 20:06:58 +0200 Subject: [PATCH 3/5] update CSS of signatures --- doc/_static/mpl.css | 55 +++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 836237d757f5..6125c3661395 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -142,10 +142,6 @@ dt:target, background-color: #ffffee; } -dl.method, dl.attribute { - border-top: 1px solid #aaa; -} - dl.glossary dt { font-weight: bold; font-size: 1.1em; @@ -677,38 +673,59 @@ table.docutils td { } -dl.class em, dl.function em, dl.class big, dl.function big { - font-weight: normal; - font-family: monospace; -} - -dl.class dd, dl.function dd { - padding: 10px; +/*** function and class description ***/ +/* top-level definitions */ +dl.class, dl.function { + border-top: 1px solid #888; + padding-top: 6px; + margin-top: 20px; } -/* function and class description */ -dl.function, dl.method, dl.attribute { +dl.method, dl.classmethod, dl.staticmethod, dl.attribute { border-top: 1px solid #ccc; padding-top: 6px; } -dl.function { - border-top: 1px solid #888; - margin-top: 15px; +em.property { + margin-right: 4px; } -dl.class { - padding-top: 6px; - margin-top: 15px; +.sig-paren { + font-size: 14px; +} + +.sig-paren ~ em { + font-weight: normal; + font-family: monospace; + font-size: 14px; +} + +dl.class big, dl.function big { + font-weight: normal; + font-family: monospace; +} + +dl.class dd, dl.function dd { + padding: 10px; +} + +dl.class > dd { + padding: 10px; + padding-left: 35px; + margin-left: 0px; + border-left: 5px solid #f8f8f8; } .descclassname { color: #aaa; font-weight: normal; font-family: monospace; + font-size: 14px; } + .descname { font-family: monospace; + font-size: 14px; } table.docutils.field-list { From 3ca72067ddb0618247466fc8111296a02e34a0fe Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Tue, 12 Jun 2018 00:00:36 +0200 Subject: [PATCH 4/5] doc CSS: better vertical positioning of text in banners --- doc/_static/mpl.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 6125c3661395..5d714ae455e8 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -810,7 +810,7 @@ figcaption { font-weight: bold; left: 0; min-height: 3em; - padding: 0.5em; + padding: 0.7em; top: 0; width: 100%; z-index: 10000; @@ -829,7 +829,7 @@ figcaption { font-weight: bold; left: 0; min-height: 3em; - padding: 0.5em; + padding: 0.7em; position: fixed; top: 0; width: 100%; From aae124bc60a74af48b61d4d9874db5beece9b481 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Tue, 12 Jun 2018 04:11:55 +0200 Subject: [PATCH 5/5] update CSS of tables --- doc/_static/mpl.css | 88 +++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 5d714ae455e8..5a9acd280881 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -290,10 +290,6 @@ p { margin: 0.8em 0 0.8em 0; } -p.rubric { - font-weight: bold; -} - h1 { margin: 0.5em 0em; padding-top: 0.5em; @@ -618,12 +614,51 @@ ul.keywordmatches li.goodmatch a { table.docutils { border-spacing: 2px; border-collapse: collapse; - border-top-width: 1px; - border-right-width: 0px; - border-bottom-width: 1px; - border-left-width: 0px; + border: 0px; +} + +table.docutils th { + border-width: 1px 0px; + border-color: #888; + background-color: #f0f0f0; + width: 100px; +} + +table.docutils td { + border-width: 1px 0px; + border-color: #ccc; } +table.docutils tr:last-of-type td { + border-bottom-color: #888; +} + +/* Section titles within classes */ +dl.class p.rubric { + font-size: 16px; +} + +/* Attribute tables */ +dl.class p.rubric + table.docutils { + margin-left: 0px; + margin-right: 0px; + margin-bottom: 1.5em; + border-top: 1px solid #888; + border-bottom: 1px solid #888; +} + +dl.class p.rubric + table.docutils td { + padding-left: 0px; + border-color: #ccc; +} + +dl.class p.rubric + table.docutils td:first-of-type > strong { + font-family: monospace; + font-size: 14px; + font-weight: normal; +} + + /* module summary table */ .longtable.docutils { font-size: 12px; @@ -640,17 +675,29 @@ table.docutils { /* tables inside parameter descriptions */ td.field-body table.property-table { width: 100%; + border-spacing: 2px; + border-collapse: collapse; + border: 0px; } td.field-body table.property-table th { padding: 2px 10px; - border: 0; + border-width: 1px 0px; + border-color: #888; + background-color: #f0f0f0; } td.field-body table.property-table td { padding: 2px 10px; + border-width: 1px 0px; + border-color: #ccc; } +td.field-body table.property-table tr:last-of-type td { + border-bottom-color: #888; +} + + /* function and class description */ .descclassname { color: #aaa; @@ -661,18 +708,6 @@ td.field-body table.property-table td { font-family: monospace; } - -table.docutils th { - padding: 1px 8px 1px 5px; - background-color: #eee; - width: 100px; -} - -table.docutils td { - border-width: 1px 0 1px 0; -} - - /*** function and class description ***/ /* top-level definitions */ dl.class, dl.function { @@ -728,29 +763,30 @@ dl.class > dd { font-size: 14px; } +/* parameter section table */ table.docutils.field-list { width: 100%; } - -.docutils.field-list th { +.docutils.field-list th.field-name { background-color: #eee; padding: 10px; text-align: left; vertical-align: top; width: 125px; } -.docutils.field-list td { +.docutils.field-list td.field-body { padding: 10px 10px 10px 20px; text-align: left; vertical-align: top; } -.docutils.field-list td blockquote p { +.docutils.field-list td.field-body blockquote p { font-size: 13px; line-height: 18px; } -.docutils.field-list td blockquote p ul li{ +.docutils.field-list td.field-body blockquote p ul li{ font-size: 13px; } + p.rubric { font-weight: bold; font-size: 19px;