From 1286b559cf77e6b8ec4b745b7fc83297c4d06a36 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Mon, 13 Jun 2022 10:30:47 +0200 Subject: [PATCH 1/3] Adapt sphinx_design.scss to simplified colors --- .../styles/extensions/_sphinx_design.scss | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_design.scss b/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_design.scss index cbc1f87aa9..bce605da14 100644 --- a/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_design.scss +++ b/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_design.scss @@ -18,15 +18,15 @@ */ .bd-content .sd-card { - border: 1px solid var(--pst-color-preformatted-border); + border: 1px solid var(--pst-color-border); .sd-card-header { background-color: var(--pst-color-panel-background); - border-bottom: 1px solid var(--pst-color-preformatted-border); + border-bottom: 1px solid var(--pst-color-border); } .sd-card-footer { background-color: var(--pst-color-panel-background); - border-top: 1px solid var(--pst-color-preformatted-border); + border-top: 1px solid var(--pst-color-border); } .sd-card-body { @@ -47,26 +47,26 @@ > input { // Active tab label &:checked + label { - border-color: var(--pst-color-active-navigation); - color: var(--pst-color-active-navigation); + border-color: var(--pst-color-primary); + color: var(--pst-color-primary); } // hover label &:not(:checked) + label:hover { - border-color: var(--pst-color-active-navigation); - color: var(--pst-color-active-navigation); + border-color: var(--pst-color-primary); + color: var(--pst-color-primary); opacity: 0.5; } } // Tab label > label { - color: var(--pst-color-deactive-navigation); + color: var(--pst-color-text-muted); // Hovered label html &:hover { - color: var(--pst-color-active-navigation); - border-color: var(--pst-color-active-navigation); + color: var(--pst-color-primary); + border-color: var(--pst-color-primary); opacity: 0.5; } } From 11c27d437dc8b87ef167d80f119639cf09ac50d7 Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Mon, 13 Jun 2022 10:33:07 +0200 Subject: [PATCH 2/3] Update _sphinx_panels.scss --- .../styles/extensions/_sphinx_panels.scss | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_panels.scss b/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_panels.scss index edd0f29fc3..acb8c9a976 100644 --- a/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_panels.scss +++ b/src/pydata_sphinx_theme/assets/styles/extensions/_sphinx_panels.scss @@ -19,15 +19,15 @@ */ .sphinx-bs .card { - border: 1px solid var(--pst-color-preformatted-border); + border: 1px solid var(--pst-color-border); background-color: var(--pst-color-panel-background); .card-header { - border-bottom: 1px solid var(--pst-color-preformatted-border); + border-bottom: 1px solid var(--pst-color-border); } .card-footer { - border-top: 1px solid var(--pst-color-preformatted-border); + border-top: 1px solid var(--pst-color-border); } } @@ -39,31 +39,31 @@ > input { // Active tab label &:checked + label { - border-color: var(--pst-color-active-navigation); - color: var(--pst-color-active-navigation); + border-color: var(--pst-color-primary); + color: var(--pst-color-primary); } // hover label &:not(:checked) + label:hover { - border-color: var(--pst-color-active-navigation); - color: var(--pst-color-active-navigation); + border-color: var(--pst-color-primary); + color: var(--pst-color-primary); opacity: 0.5; } } // Tab label > label { - color: var(--pst-color-deactive-navigation); + color: var(--pst-color-text-muted); // Hovered label html &:hover { - color: var(--pst-color-active-navigation); - border-color: var(--pst-color-active-navigation); + color: var(--pst-color-primary); + border-color: var(--pst-color-primary); opacity: 0.5; } } > .tabbed-content { - border-color: var(pst-color-border); + border-color: var(--pst-color-border); } } From 902d0f4aff3833ea254ce3833d3a53794889474b Mon Sep 17 00:00:00 2001 From: Morten Enemark Lund Date: Mon, 13 Jun 2022 12:04:28 +0200 Subject: [PATCH 3/3] Fixed undefined color variable `--pst-color-background-up` was not defined. Replacing with `--pst-color-on-background` --- src/pydata_sphinx_theme/assets/styles/variables/_color.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pydata_sphinx_theme/assets/styles/variables/_color.scss b/src/pydata_sphinx_theme/assets/styles/variables/_color.scss index 5b5aa9bb9c..7daa42840f 100644 --- a/src/pydata_sphinx_theme/assets/styles/variables/_color.scss +++ b/src/pydata_sphinx_theme/assets/styles/variables/_color.scss @@ -35,7 +35,7 @@ html[data-theme="light"] { * extentions */ - --pst-color-panel-background: var(--pst-color-background); + --pst-color-panel-background: var(--pst-color-on-background); /***************************************************************************** * layout @@ -94,7 +94,7 @@ html[data-theme="dark"] { * extentions */ - --pst-color-panel-background: var(--pst-color-background-up); + --pst-color-panel-background: var(--pst-color-on-background); /***************************************************************************** * layout