From 211f83e52e7ee41d46fee19ef33e8f79fd10b2d4 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 19:23:34 +0200 Subject: [PATCH 01/15] link color --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index 65bb65f..d983fa1 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -67,7 +67,7 @@ $box-title-padding: 0 2em 0 1.5em; $box-header-color: #c5cec2; $box-background-color: #f8f9f0; -$hyperlink-color: #990000; +$hyperlink-color: #f00000; $keyword-color: #480717; $keyword-background-color: #f2f2f2; From 84c3299970ed166269d1384d4542b2b1e70b9666 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 19:26:34 +0200 Subject: [PATCH 02/15] remove content and sidebar border and lighten general border style color --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index d983fa1..8942670 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -49,8 +49,8 @@ $legacy-background-color: #fcffc0; $warning-background-color: #fcf0f6; $deepalchemy-background-color: #f6e8fd; $versionchanged-background-color: #f9f9d9; -$border-style: 1px solid #ccc; -$divider-line-style: 1px solid #ccc; +$border-style: 1px solid #f1f1f1; +$divider-line-style: 1px solid #f1f1f1; $box-shadow-style: 2px 2px 3px #dfdfdf; $box-top-margin: 10px; @@ -349,7 +349,6 @@ a.headerlink:hover { font-size: 0.85em; - border: $border-style; background-color: $sidebar-color; > ul { @@ -456,7 +455,6 @@ a.headerlink:hover { background-color: #ffffff; padding: 1px 10px 10px 10px; - border: $border-style; margin-top: 10px; } From 809c765e64fb6b8dd4c8b151174b0aa503676142 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 19:29:29 +0200 Subject: [PATCH 03/15] remove box shadows --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index 8942670..ac4132d 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -52,7 +52,6 @@ $versionchanged-background-color: #f9f9d9; $border-style: 1px solid #f1f1f1; $divider-line-style: 1px solid #f1f1f1; -$box-shadow-style: 2px 2px 3px #dfdfdf; $box-top-margin: 10px; $box-margin: $box-top-margin 10px 20px 0px; @@ -587,7 +586,6 @@ a.headerlink:hover { font-size: .85rem; background-color: #f0f0f0; border: $border-style; - box-shadow: $box-shadow-style; padding: 10px; margin: $box-margin; overflow: auto; @@ -808,7 +806,6 @@ div { padding: 0 20px 0 20px; background-color: $box-background-color; border: $border-style; - box-shadow: $box-shadow-style; margin: $box-margin; } @@ -911,7 +908,6 @@ div.legacy { div.class-bases, div.class-members { border: $border-style; - box-shadow: $box-shadow-style; padding: 5px 5px; padding: $box-padding; @@ -928,7 +924,6 @@ div.class-members { div.inherited-member { border: $border-style; - box-shadow: $box-shadow-style; padding: 5px 5px; font-size: 0.9em; background-color: #eefbfb; @@ -950,7 +945,6 @@ dl.method > dt, dl.class > dt, dl.exception > dt { border: $border-style; - box-shadow: $box-shadow-style; background-color: $code-sig-background-color; margin: 25px -10px 10px 10px; padding: 8px 10px; @@ -961,7 +955,6 @@ dl.field-list { border-left: $border-style; border-right: $border-style; border-bottom: $border-style; - box-shadow: $box-shadow-style; margin: $box-top-margin 10px 0 0; li > p { From d2bb773545e1c13399c8d1273661f334d4568b6a Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 22:45:37 +0200 Subject: [PATCH 04/15] pre box borders --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index ac4132d..ce571fa 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -49,8 +49,8 @@ $legacy-background-color: #fcffc0; $warning-background-color: #fcf0f6; $deepalchemy-background-color: #f6e8fd; $versionchanged-background-color: #f9f9d9; -$border-style: 1px solid #f1f1f1; -$divider-line-style: 1px solid #f1f1f1; +$border-style: 1px solid #e6e9ec; +$divider-line-style: 1px solid #e6e9ec; $box-top-margin: 10px; $box-margin: $box-top-margin 10px 20px 0px; @@ -64,7 +64,8 @@ $box-padding: 1rem 1em 2px 1rem; $box-title-padding: 0 2em 0 1.5em; $box-header-color: #c5cec2; -$box-background-color: #f8f9f0; +$box-background-color: #F8F9FA; +$box-border-radius: 4px; $hyperlink-color: #f00000; $keyword-color: #480717; @@ -584,7 +585,8 @@ a.headerlink:hover { #docs-container { pre { font-size: .85rem; - background-color: #f0f0f0; + background-color: #F8F9FA; + border-radius: $box-border-radius; border: $border-style; padding: 10px; margin: $box-margin; From e7134cb5fe6e6ce065fd86001c8139f0c2a87ca6 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 22:55:32 +0200 Subject: [PATCH 05/15] box title remove hard borders --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index ce571fa..28c8088 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -790,15 +790,11 @@ div { .admonition-title, .sidebar-title, .topic-title { - background-color: $box-header-color; padding: $box-title-padding; - margin: 0 -20px 20px -20px; + margin: 10px -20px 20px -20px; font-weight: bold; - border-left: $border-style; - border-right: $border-style; - border-bottom: $border-style; } > p { From 6345cdf53d3dba8ae98a93613046bd30c4c0da23 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 8 Apr 2023 22:56:16 +0200 Subject: [PATCH 06/15] uniform border radius on card lines with other elements --- zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index 28c8088..06c9478 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -1198,7 +1198,7 @@ div#dialect-documentation { box-shadow: 0px 0px 2px #ccc; padding-top: 1px; padding-bottom: 1px; - border-radius: 10px; + border-radius: $box-border-radius; h2 { border-top: none; From 1cf5dfb504ae1e5ef50e80d55374015db809e638 Mon Sep 17 00:00:00 2001 From: DRC Date: Sun, 9 Apr 2023 00:26:20 +0200 Subject: [PATCH 07/15] sidebar styles, lighten colors to move focus on content --- zzzeeksphinx/themes/zsbase/layout.mako | 5 +- .../themes/zzzeeksphinx/static/docs.scss | 70 ++++++++++++------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/zzzeeksphinx/themes/zsbase/layout.mako b/zzzeeksphinx/themes/zsbase/layout.mako index 969b6df..6aac8e5 100644 --- a/zzzeeksphinx/themes/zsbase/layout.mako +++ b/zzzeeksphinx/themes/zsbase/layout.mako @@ -90,6 +90,8 @@ withsidebar = bool(toc) and (
+

${docstitle|h}

+
Release: ${release} @@ -111,8 +113,6 @@ withsidebar = bool(toc) and (
-

${docstitle|h}

-
@@ -146,7 +146,6 @@ withsidebar = bool(toc) and ( % if withsidebar:
-

${docstitle|h}

% if is_beta_version: % elif is_prerelease_version: diff --git a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss index 06c9478..1801145 100644 --- a/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss +++ b/zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss @@ -39,7 +39,7 @@ $narrow-max-screen-width: 980px; $primary-background-color: #fdfbfc; $topmost-header-color: #ebebee; $popout-color: #fbfbee; -$sidebar-color: #efefef; +$sidebar-border-color: #e9eaeb; $sidebar-header-background-color: #dddddd; $sidebar-header-color: #222222; $notebox-background-color: #eeffef; @@ -71,7 +71,7 @@ $hyperlink-color: #f00000; $keyword-color: #480717; $keyword-background-color: #f2f2f2; -$highlighted-nav-link-background-color: #ddd; +$highlighted-nav-link-background-color: #e8e8e8; $orm-background-color: #e2f3f4; $core-background-color: #aecaf7; @@ -161,20 +161,28 @@ a.headerlink:hover { #docs-header { font-family: $primary-font-family; - font-size: 0.9em; + font-size: 0.75em; position: relative; background-color: $topmost-header-color; border: $border-style; - height: 75px; + padding: 10px; display: flex; align-items: center; h1 { - font-size: 20px; - color: #222222; - margin-left: 10px; + &, a { + margin: 0; + font-size: 1em; + color: #222222; + font-weight: bold; + } + } + + #docs-version-header { + order: 2; + margin-left: auto; } } @@ -183,9 +191,14 @@ a.headerlink:hover { #index-nav, #narrow-index-nav { font-family: $sidebar-font-family; + font-size: 0.8em; +} + +#docs-bottom-navigation, +#index-nav, +#narrow-index-nav { background-color: $popout-color; border: $border-style; - font-size: 0.8em; } #docs-bottom-navigation, @@ -193,12 +206,6 @@ a.headerlink:hover { padding: 10px; } -#docs-version-header { - position: absolute; - right: 8px; - bottom: 8px; -} - .docs-navigation-links { font-family: $primary-font-family; } @@ -280,21 +287,18 @@ a.headerlink:hover { left: 10px; } -#sidebar-topnav { -} - #sidebar-search { margin: 10px 0px 10px 0px; } #docs-sidebar { - top: $sidebar-popout-height + 18px; + top: $sidebar-popout-height; width: $fixed-sidebar-width; + padding-top: 18px; bottom: 0; min-height: 0; overflow-y: auto; overflow-x: hidden; - margin-top: 5px; margin-right: 5px; z-index: 3; } @@ -349,7 +353,7 @@ a.headerlink:hover { font-size: 0.85em; - background-color: $sidebar-color; + border-right: 1px solid $sidebar-border-color; > ul { font-size: 0.85em; @@ -370,17 +374,17 @@ a.headerlink:hover { h3, h4, h5 { - background-color: $sidebar-header-background-color; color: $sidebar-header-color; font-family: $sidebar-font-family; - font-size: 1.1em; - font-weight: normal; - margin: 10px 0 0 -15px; + font-size: 0.9em; + text-transform: uppercase; + font-weight: bold; + margin: 15px 0 0 -15px; padding: 5px 10px 5px 15px; - text-shadow: 1px 1px 0 white; - + a { color: $sidebar-header-color; + font-weight: bold; } } @@ -399,6 +403,10 @@ a.headerlink:hover { margin-left: 20px; } } + + a { + color: inherit; + } } #docs-sidebar-popout { @@ -418,6 +426,15 @@ a.headerlink:hover { h3 { margin: 0 0 10px 0; + &, a { + color: inherit; + } + } + + #sidebar-topnav { + font-size: 0.75rem; + font-weight: bold; + text-transform: uppercase; } } @@ -518,7 +535,6 @@ a.headerlink:hover { #docs-narrow-top-navigation { border: $border-style; - background-color: $sidebar-color; font-family: $sidebar-font-family; font-size: 0.85rem; From cd2d331bf1c66ada2f9b1fa8bb6a62305505d9df Mon Sep 17 00:00:00 2001 From: DRC Date: Sun, 9 Apr 2023 01:32:27 +0200 Subject: [PATCH 08/15] search box style --- zzzeeksphinx/themes/zsbase/layout.mako | 9 ------ .../themes/zzzeeksphinx/static/docs.scss | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/zzzeeksphinx/themes/zsbase/layout.mako b/zzzeeksphinx/themes/zsbase/layout.mako index 6aac8e5..3af7f3b 100644 --- a/zzzeeksphinx/themes/zsbase/layout.mako +++ b/zzzeeksphinx/themes/zsbase/layout.mako @@ -146,15 +146,6 @@ withsidebar = bool(toc) and ( % if withsidebar:
- % if is_beta_version: - - % elif is_prerelease_version: - - % elif is_legacy_version: - - % elif is_current_version: - - % endif
+
% if prevtopic: +
Previous: ${prevtopic['title']} +
% endif % if nexttopic: + % endif +