From 6c7fe6d5420e7e3a4d113ec4f2428c20b215052a Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 1 May 2014 20:39:46 -0400 Subject: - experiment with multi-zoned navigation --- doc/build/static/docs.css | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index b7c02248b..54ae768d0 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -90,10 +90,11 @@ a.headerlink:hover { } #docs-top-navigation { - margin:10px 0px 10px 0px; + margin:10px 0px; line-height:1.2em; } + .docs-navigation-links { font-family:Verdana,sans-serif; } @@ -149,8 +150,6 @@ a.headerlink:hover { /* content container, sidebar */ #docs-body-container { - background-color:#EFEFEF; - border: solid 1px #CCC; } #docs-body, @@ -174,12 +173,37 @@ a.headerlink:hover { } #docs-sidebar { - float:left; - width:212px; - padding: 10px 0 0 15px; + + width:210px; + padding: 0px 0 0 15px; font-size:.85em; + + border: solid 1px #CCC; + + float:left; + + z-index: 3; + background-color: #EFEFEF; + +} + +#docs-top-navigation-container.automated { + position:fixed; + top:0; + z-index:100; + width:100%; + background-color:#FFF; +} + +#docs-sidebar.automated { + float: none; + position: fixed; + top: 96px; + bottom: 0; + overflow-y: auto; } + #docs-sidebar h3, #docs-sidebar h4 { background-color: #DDDDDD; color: #222222; @@ -189,7 +213,7 @@ a.headerlink:hover { margin: 10px 0 0 -15px; padding: 5px 10px 5px 10px; text-shadow: 1px 1px 0 white; - width:210px; + /*width:210px;*/ } #docs-sidebar h3 a, #docs-sidebar h4 a { @@ -212,11 +236,13 @@ a.headerlink:hover { #docs-body { background-color:#FFFFFF; padding:1px 10px 10px 10px; + + border: solid 1px #CCC; + } #docs-body.withsidebar { margin: 0 0 0 230px; - border-left:3px solid #DFDFDF; } #docs-body h1, -- cgit v1.2.1 From 461bf436690d24625310d1addd968c81510360bf Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 26 May 2014 12:31:43 -0400 Subject: - pull in the whole top into the fixed part, reduce the size, clean it up --- doc/build/static/docs.css | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 54ae768d0..d3131bfc7 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -2,7 +2,7 @@ body { background-color: #FDFBFC; - margin:38px; + margin:0 38px; color:#333333; } @@ -61,6 +61,7 @@ a.headerlink:hover { #docs-container { max-width:1000px; + margin: 0 auto; } @@ -77,7 +78,7 @@ a.headerlink:hover { font-family:Verdana,sans-serif; font-size:.9em; - + position: relative; } #docs-top-navigation, @@ -92,8 +93,14 @@ a.headerlink:hover { #docs-top-navigation { margin:10px 0px; line-height:1.2em; + position: relative; } +#docs-version-header { + position: absolute; + right: 0; + bottom: 0; +} .docs-navigation-links { font-family:Verdana,sans-serif; @@ -121,13 +128,10 @@ a.headerlink:hover { font-size:1.6em; } -#docs-search { - float:right; -} - #docs-top-page-control { - float:right; - width:350px; + position: absolute; + right: 20px; + bottom: 14px; } #docs-top-page-control ul { -- cgit v1.2.1 From e17ea5b3af050abd494b1d985b986455e0b26d80 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 26 May 2014 13:11:10 -0400 Subject: - automate the offset part --- doc/build/static/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index d3131bfc7..9797bbf65 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -185,7 +185,7 @@ a.headerlink:hover { border: solid 1px #CCC; float:left; - + min-height: 700px; z-index: 3; background-color: #EFEFEF; -- cgit v1.2.1 From 2ce24b64e17075726761eb7b017642ea05c72479 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 26 May 2014 16:40:24 -0400 Subject: more tweaks --- doc/build/static/docs.css | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 9797bbf65..f9d60a45a 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -199,12 +199,25 @@ a.headerlink:hover { background-color:#FFF; } +#docs-sidebar.preautomated { + overflow-y: auto; + bottom: 0; +} + +/* http://css-tricks.com/hash-tag-links-padding/ */ +#docs-container.preautomated div.section:before { + content: " "; + display: block; + height:100px; + margin-top: -100px; + visibility: hidden; +} + #docs-sidebar.automated { float: none; position: fixed; - top: 96px; - bottom: 0; - overflow-y: auto; + top: 120px; + min-height: 0; } -- cgit v1.2.1 From a0366c9a56156bb01506d6ed977d945c371d0d06 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 27 May 2014 13:24:58 -0400 Subject: - use relative/absolute positioning and greatly simplify everything, works in chrome + safari --- doc/build/static/docs.css | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index f9d60a45a..a740fc426 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -62,6 +62,7 @@ a.headerlink:hover { #docs-container { max-width:1000px; margin: 0 auto; + position: relative; } @@ -184,11 +185,19 @@ a.headerlink:hover { border: solid 1px #CCC; - float:left; - min-height: 700px; z-index: 3; background-color: #EFEFEF; + position: absolute; + top: 120px; + bottom: 0; + min-height: 0; + overflow-y: auto; +} + + +#docs-top-navigation-container { + background-color:#FFF; } #docs-top-navigation-container.automated { @@ -199,11 +208,6 @@ a.headerlink:hover { background-color:#FFF; } -#docs-sidebar.preautomated { - overflow-y: auto; - bottom: 0; -} - /* http://css-tricks.com/hash-tag-links-padding/ */ #docs-container.preautomated div.section:before { content: " "; @@ -213,8 +217,15 @@ a.headerlink:hover { visibility: hidden; } + +#docs-sidebar.preautomated:after { + content: " "; + display:block; + height: 150px; +} + + #docs-sidebar.automated { - float: none; position: fixed; top: 120px; min-height: 0; -- cgit v1.2.1 From bb671fafcaf029b298aceb9faba8901c648208f0 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 27 May 2014 16:53:49 -0400 Subject: OK this one seems to be the most solid --- doc/build/static/docs.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index a740fc426..f6e7cc6f2 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -1,5 +1,9 @@ /* global */ +.body-background { + background-color: #FDFBFC; +} + body { background-color: #FDFBFC; margin:0 38px; @@ -197,7 +201,6 @@ a.headerlink:hover { #docs-top-navigation-container { - background-color:#FFF; } #docs-top-navigation-container.automated { @@ -205,7 +208,6 @@ a.headerlink:hover { top:0; z-index:100; width:100%; - background-color:#FFF; } /* http://css-tricks.com/hash-tag-links-padding/ */ -- cgit v1.2.1 From 59111c50c1e9a772dd5ca99831ec7640e5228543 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 27 May 2014 17:05:50 -0400 Subject: - go back to float:left for the sidenav in normal mode, we had a clear:right causing the issue --- doc/build/static/docs.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index f6e7cc6f2..dacabde90 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -192,7 +192,8 @@ a.headerlink:hover { z-index: 3; background-color: #EFEFEF; - position: absolute; + /*position: absolute;*/ + float: left; top: 120px; bottom: 0; min-height: 0; @@ -229,6 +230,7 @@ a.headerlink:hover { #docs-sidebar.automated { position: fixed; + float: none; top: 120px; min-height: 0; } @@ -379,7 +381,7 @@ th.field-name { } div.section { - clear:right; + /*clear:right;*/ } div.note, div.warning, p.deprecated, div.topic, div.admonition { background-color:#EEFFEF; -- cgit v1.2.1 From 70159e7551b2479ade34a9382bfe76af485e1212 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 27 May 2014 17:55:38 -0400 Subject: - again use "fixed" for sidebar in all automated cases, dynamically adjust its top within the initial scroll period, this is what foundationdb is doing. For whatever reason that comes out smooth on all browsers. the rationale is so that its independently scrollable at all times. --- doc/build/static/docs.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index dacabde90..3bb77acc4 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -192,7 +192,6 @@ a.headerlink:hover { z-index: 3; background-color: #EFEFEF; - /*position: absolute;*/ float: left; top: 120px; bottom: 0; @@ -228,6 +227,10 @@ a.headerlink:hover { } +#docs-sidebar.preautomated { + position: fixed; +} + #docs-sidebar.automated { position: fixed; float: none; @@ -381,8 +384,8 @@ th.field-name { } div.section { - /*clear:right;*/ } + div.note, div.warning, p.deprecated, div.topic, div.admonition { background-color:#EEFFEF; } -- cgit v1.2.1 From 5dfcf24b85567dd6c75766edf1757fa4d5f33a68 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 27 May 2014 19:06:30 -0400 Subject: - add some more height here so that anchors come out --- doc/build/static/docs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 3bb77acc4..99858b429 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -214,8 +214,8 @@ a.headerlink:hover { #docs-container.preautomated div.section:before { content: " "; display: block; - height:100px; - margin-top: -100px; + height:120px; + margin-top: -120px; visibility: hidden; } -- cgit v1.2.1 From 686887688d33995b3edead74d352af66b21c80ea Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 29 May 2014 15:26:31 -0400 Subject: - all new approach which allows the main text to be on the top --- doc/build/static/docs.css | 124 ++++++++++++++++++++++++++++------------------ 1 file changed, 77 insertions(+), 47 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 99858b429..07b87274d 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -86,8 +86,9 @@ a.headerlink:hover { position: relative; } -#docs-top-navigation, -#docs-bottom-navigation { +#docs-sidebar-popout, +#docs-bottom-navigation, +#index-nav { font-family: Verdana, sans-serif; background-color: #FBFBEE; border: solid 1px #CCC; @@ -95,12 +96,20 @@ a.headerlink:hover { font-size:.8em; } -#docs-top-navigation { - margin:10px 0px; - line-height:1.2em; - position: relative; +#docs-sidebar-popout { + font-size:.75em; +} + +#docs-sidebar-popout p, +#docs-sidebar-popout form { + margin:5px 0 5px 0px; } +#docs-sidebar-popout h3 { + margin:0 0 10px 0; +} + + #docs-version-header { position: absolute; right: 0; @@ -162,7 +171,8 @@ a.headerlink:hover { } #docs-body, -#docs-sidebar +#docs-sidebar, +#index-nav { /*font-family: helvetica, arial, sans-serif; font-size:.9em;*/ @@ -181,64 +191,75 @@ a.headerlink:hover { font-size:.85em; } -#docs-sidebar { +#fixed-sidebar { + position: relative; +} - width:210px; - padding: 0px 0 0 15px; +#fixed-sidebar.withsidebar { + float: left; + width:224px; +} + +#fixed-sidebar.preautomated { + position: fixed; + float: none; + top:0; + bottom: 0; +} + +#fixed-sidebar.automated { + position: fixed; + float: none; + top: 120px; + min-height: 0; +} + + +#docs-sidebar { font-size:.85em; border: solid 1px #CCC; z-index: 3; background-color: #EFEFEF; +} - float: left; - top: 120px; +#index-nav { + margin-top:10px; + padding:0 10px; +} + +#index-nav form { + float:right; + padding-top:10px; +} + +#docs-sidebar { + padding: 0px 0 0 15px; + + top: 150px; bottom: 0; min-height: 0; overflow-y: auto; } - -#docs-top-navigation-container { +#docs-sidebar-popout { + height:120px; + max-height: 120px; + position:absolute; } -#docs-top-navigation-container.automated { - position:fixed; - top:0; - z-index:100; - width:100%; -} -/* http://css-tricks.com/hash-tag-links-padding/ */ -#docs-container.preautomated div.section:before { - content: " "; - display: block; - height:120px; - margin-top: -120px; - visibility: hidden; +#fixed-sidebar.preautomated #docs-sidebar { + position:absolute; } - -#docs-sidebar.preautomated:after { +#fixed-sidebar.preautomated #docs-sidebar:after { content: " "; display:block; height: 150px; } - -#docs-sidebar.preautomated { - position: fixed; -} - -#docs-sidebar.automated { - position: fixed; - float: none; - top: 120px; - min-height: 0; -} - - #docs-sidebar h3, #docs-sidebar h4 { background-color: #DDDDDD; color: #222222; @@ -251,6 +272,10 @@ a.headerlink:hover { /*width:210px;*/ } +#docs-sidebar h3:first-child { + margin-top: 0px; +} + #docs-sidebar h3 a, #docs-sidebar h4 a { color: #222222; } @@ -268,18 +293,22 @@ a.headerlink:hover { margin-left: 20px; } + + + #docs-body { background-color:#FFFFFF; padding:1px 10px 10px 10px; border: solid 1px #CCC; - + margin-top:10px; } #docs-body.withsidebar { - margin: 0 0 0 230px; + margin-left: 230px; } + #docs-body h1, #docs-body h2, #docs-body h3, @@ -287,12 +316,13 @@ a.headerlink:hover { font-family:Helvetica, Arial, sans-serif; } -#docs-body h1 { +#docs-body #sqlalchemy-documentation h1 { /* hide the

for each content section. */ display:none; font-size:2.0em; } + #docs-body h2 { font-size:1.8em; border-top:1px solid; @@ -410,7 +440,6 @@ div.admonition, div.topic, .deprecated, .versionadded, .versionchanged { box-shadow: 2px 2px 3px #DFDFDF; } - div.sidebar { background-color: #FFFFEE; border: 1px solid #DDDDBB; @@ -466,11 +495,12 @@ dl.method > dt, dl.class > dt, dl.exception > dt { - background-color:#F0F0F0; + background-color: #EFEFEF; margin:25px -10px 10px 10px; padding: 0px 10px; } + dl.glossary > dt { font-weight:bold; font-size:1.1em; -- cgit v1.2.1 From 39e15ac76029ca65d01a106d162afa2c49ffbc16 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 29 May 2014 15:38:17 -0400 Subject: more --- doc/build/static/docs.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc/build/static/docs.css') diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css index 07b87274d..cc221f619 100644 --- a/doc/build/static/docs.css +++ b/doc/build/static/docs.css @@ -237,20 +237,21 @@ a.headerlink:hover { #docs-sidebar { padding: 0px 0 0 15px; - top: 150px; + top: 140px; bottom: 0; min-height: 0; overflow-y: auto; + margin-top:10px; } #docs-sidebar-popout { height:120px; max-height: 120px; - position:absolute; } -#fixed-sidebar.preautomated #docs-sidebar { +#fixed-sidebar.preautomated #docs-sidebar, +#fixed-sidebar.preautomated #docs-sidebar-popout { position:absolute; } -- cgit v1.2.1