From e7429b6e98922fe3bac1cff44c41ebd1ecb90bda Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 01:28:25 -0500 Subject: [PATCH 01/13] DOC: Change body layout so that it doesn't wrap around sidebar. --- doc/source/themes/agogo/static/agogo.css_t | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 2723be72..2f989f5d 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -188,6 +188,8 @@ div.document { div.body { padding-right: 2em; text-align: {{ theme_textalign }}; + overflow: hidden; + min-width: 20em; } div.document ul { @@ -520,8 +522,8 @@ div.body h6 { font-weight: normal; color: {{ theme_headtextcolor }}; border-bottom: 1px solid #ccc; - margin: 20px -20px 10px -20px; - padding: 3px 0 3px 10px; + margin: 20px 20px 10px 0px; + padding: 3px 0 3px 0px; } div.body h1 { margin-top: 0; font-size: 200%; } From 2ff1e1abe5d3b86971be13c4cdedca3a40f2cf4a Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 01:42:16 -0500 Subject: [PATCH 02/13] DOC: Adjust font sizes. --- doc/source/themes/agogo/static/agogo.css_t | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 2f989f5d..1160305c 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -187,9 +187,10 @@ div.document { div.body { padding-right: 2em; - text-align: {{ theme_textalign }}; - overflow: hidden; min-width: 20em; + overflow: hidden; + font-size: 90%; + text-align: {{ theme_textalign }}; } div.document ul { @@ -526,9 +527,9 @@ div.body h6 { padding: 3px 0 3px 0px; } -div.body h1 { margin-top: 0; font-size: 200%; } -div.body h2 { font-size: 160%; } -div.body h3 { font-size: 140%; } +div.body h1 { margin-top: 0; font-size: 160%; } +div.body h2 { font-size: 150%; } +div.body h3 { font-size: 130%; } div.body h4 { font-size: 120%; } div.body h5 { font-size: 110%; } div.body h6 { font-size: 100%; } From ded349afb0ffab651353e435a77acc4be2263724 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 01:45:02 -0500 Subject: [PATCH 03/13] DOC: Remove duplicate css definition. --- doc/source/themes/agogo/static/agogo.css_t | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 1160305c..7b80b3bb 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -507,11 +507,6 @@ a:hover { text-decoration: underline; } -div.body p, div.body dd, div.body li { - text-align: justify; - line-height: 130%; -} - div.body h1, div.body h2, div.body h3, From 2debda4673847adaf60f5e0be566e7e843d84c45 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 01:47:26 -0500 Subject: [PATCH 04/13] DOC: Increase spacing between paragraphs. --- doc/source/themes/agogo/static/agogo.css_t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 7b80b3bb..7a891f30 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -225,7 +225,7 @@ div.document h2 { } div.document p { - margin-bottom: .5em; + margin-bottom: 1.5em; } div.document li.toctree-l1 { From fadd72dcf8cedb4f99f93a190d0ebbb22f9627ec Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 01:59:18 -0500 Subject: [PATCH 05/13] DOC: Adjust heading size and color. --- doc/source/themes/agogo/static/agogo.css_t | 5 +++-- doc/source/themes/agogo/theme.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 7a891f30..fd0739d9 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -89,7 +89,8 @@ h1 { h2 { padding-bottom: .5em; - border-bottom: 1px solid {{ theme_headercolor2 }}; + color: {{ theme_headercolor1 }}; + border-bottom: 1px solid {{ theme_headercolor1 }}; } a.headerlink { @@ -522,7 +523,7 @@ div.body h6 { padding: 3px 0 3px 0px; } -div.body h1 { margin-top: 0; font-size: 160%; } +div.body h1 { margin-top: 0; font-size: 180%; } div.body h2 { font-size: 150%; } div.body h3 { font-size: 130%; } div.body h4 { font-size: 120%; } diff --git a/doc/source/themes/agogo/theme.conf b/doc/source/themes/agogo/theme.conf index 3a6e6c60..64b97d54 100644 --- a/doc/source/themes/agogo/theme.conf +++ b/doc/source/themes/agogo/theme.conf @@ -13,6 +13,6 @@ headerbg = url(bgtop.png) top left repeat-x footerbg = url(bgfooter.png) top left repeat-x linkcolor = #ce5c00 headercolor1 = #204a87 -headercolor2 = #3465a4 +headercolor2 = #555 headerlinkcolor = #fcaf3e textalign = justify From 6fe3996fda382acb0ab31f9ebba9ebca1691348c Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 02:15:48 -0500 Subject: [PATCH 06/13] DOC: Adjust header and link colors. --- doc/source/themes/agogo/theme.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/themes/agogo/theme.conf b/doc/source/themes/agogo/theme.conf index 64b97d54..29b359b3 100644 --- a/doc/source/themes/agogo/theme.conf +++ b/doc/source/themes/agogo/theme.conf @@ -11,8 +11,8 @@ sidebarwidth = 14em bgcolor = white headerbg = url(bgtop.png) top left repeat-x footerbg = url(bgfooter.png) top left repeat-x -linkcolor = #ce5c00 -headercolor1 = #204a87 +linkcolor = #FC852B +headercolor1 = #555 headercolor2 = #555 headerlinkcolor = #fcaf3e textalign = justify From 05b291fb3ac9117699f5f3fbd7b948407885331c Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 02:28:27 -0500 Subject: [PATCH 07/13] DOC: Remove duplicate "pre" formatting. --- doc/source/themes/agogo/static/agogo.css_t | 7 +------ doc/source/themes/agogo/theme.conf | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index fd0739d9..a1838105 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -113,11 +113,6 @@ img { border: 0; } -pre { - background-color: #EEE; - padding: 0.5em; -} - div.admonition { margin-top: 10px; margin-bottom: 10px; @@ -579,7 +574,7 @@ p.admonition-title:after { } pre { - padding: 5px; + padding: 1em; background-color: {{ theme_codebgcolor }}; color: {{ theme_codetextcolor }}; line-height: 120%; diff --git a/doc/source/themes/agogo/theme.conf b/doc/source/themes/agogo/theme.conf index 29b359b3..a991e5c0 100644 --- a/doc/source/themes/agogo/theme.conf +++ b/doc/source/themes/agogo/theme.conf @@ -15,4 +15,5 @@ linkcolor = #FC852B headercolor1 = #555 headercolor2 = #555 headerlinkcolor = #fcaf3e +codebgcolor = #EEE textalign = justify From 7da2c0d544431a911142c19501a594b1ea79bed9 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 02:51:58 -0500 Subject: [PATCH 08/13] DOC: Adjust link font in contentstable. --- doc/source/themes/agogo/static/agogo.css_t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index a1838105..23ebb175 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -421,12 +421,12 @@ table.contentstable p.biglink { line-height: 150%; } -table.contentstable { +table.contentstable, table.contentstable td, table.contentstable th { border-style: none; } -table.contentstable td, table.contentstable th { - border-style: none; +table.contentstable a { + font-size: 120%; } a.biglink { From db3d328fba564a8063cbc2b4f3ccb186190a48e8 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 03:18:43 -0500 Subject: [PATCH 09/13] DOC: Tweak layout of contents table. --- doc/source/index.txt | 8 +++++--- doc/source/themes/agogo/static/agogo.css_t | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/source/index.txt b/doc/source/index.txt index 7ffda9ce..362d79ab 100644 --- a/doc/source/index.txt +++ b/doc/source/index.txt @@ -38,11 +38,13 @@ Sections Conditions on the use and redistribution of this package. + * - `Examples `_ + + Introductory examples + + - -`Examples `_ - -Introductory examples Indices and Tables ================== diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 23ebb175..4a947245 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -425,7 +425,13 @@ table.contentstable, table.contentstable td, table.contentstable th { border-style: none; } +div.body table.contentstable p { + margin: 0.5em; + text-align: left; +} + table.contentstable a { + text-decoration: none; font-size: 120%; } From bd34cc6c7c71e637b3794cd0343ce1d045db714c Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 03:50:59 -0500 Subject: [PATCH 10/13] DOC: Adjust spacing between sections of sidebar. --- doc/source/themes/agogo/static/agogo.css_t | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 4a947245..ef9f56b1 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -291,6 +291,7 @@ div.sphinxsidebar .tile { } div.sphinxsidebar ul { + margin-bottom: 1.5em; list-style-type: none; } From d1c305604555d10301e0e6bfa8ac3f2c30630bf3 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 13:02:50 -0500 Subject: [PATCH 11/13] DOC: Adjust size of tt text (i.e. ``text``). --- doc/source/themes/agogo/static/agogo.css_t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index ef9f56b1..9083274c 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -593,7 +593,7 @@ pre { tt { background-color: #ecf0f3; padding: 0 1px 0 1px; - font-size: 0.95em; + font-size: 1em; } table { From 86963c4138417f853b25e1c3cdbeb1633e6d6c6d Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 14:24:35 -0500 Subject: [PATCH 12/13] DOC: Adjust spacing after `pre` block. --- doc/source/themes/agogo/static/agogo.css_t | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 9083274c..7d473713 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -582,6 +582,7 @@ p.admonition-title:after { pre { padding: 1em; + margin-bottom: 0.5em; background-color: {{ theme_codebgcolor }}; color: {{ theme_codetextcolor }}; line-height: 120%; From 4431a216a3950f61f26e39d7156576701d64be1a Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 5 Feb 2012 15:48:40 -0500 Subject: [PATCH 13/13] DOC: Fix grid layout of gallery. --- doc/ext/gen_rst.py | 1 + doc/source/themes/agogo/static/agogo.css_t | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/doc/ext/gen_rst.py b/doc/ext/gen_rst.py index 69840399..b8356ec3 100644 --- a/doc/ext/gen_rst.py +++ b/doc/ext/gen_rst.py @@ -186,6 +186,7 @@ def generate_dir_rst(dir, fhindex, example_dir, root_dir, plot_gallery): fhindex.write('.. figure:: %s\n' % thumb) if link_name.startswith('._'): link_name = link_name[2:] + fhindex.write(' :figclass: gallery\n') if dir != '.': fhindex.write(' :target: ./%s/%s.html\n\n' % (dir, fname[:-3])) else: diff --git a/doc/source/themes/agogo/static/agogo.css_t b/doc/source/themes/agogo/static/agogo.css_t index 7d473713..b229cc96 100644 --- a/doc/source/themes/agogo/static/agogo.css_t +++ b/doc/source/themes/agogo/static/agogo.css_t @@ -637,6 +637,16 @@ th { font-size: 80%; } +/* ----------------- Example Gallery ----------------- */ + +.gallery { + min-height: 250px; +} + +.gallery p.caption a{ + text-decoration: none; +} + /* ----------------- Coverage States ----------------- */ span.missing{ color: #000;