Merge branch 'main' into docs/add-extrahead-for-verification

mckinsey · Jan 25, 2025 · 3433453 · 3433453
2 parents d9b90d5 + bcfd74d
commit 3433453
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 3 deletions.
diff --git a/vizro-ai/examples/dashboard_ui/assets/custom.css b/vizro-ai/examples/dashboard_ui/assets/custom.css
@@ -301,7 +301,7 @@
   background: var(--text-primary);
   border-top-left-radius: 8px;
   bottom: 0;
-  color: var(--text-primary-inverted);
+  color: var(--text-primary-inverted) !important;
   display: flex;
   font-size: 0.8rem;
   font-weight: 500;

diff --git a/vizro-core/changelog.d/20250123_183556_huong_li_nguyen_fix_css_nav_links.md b/vizro-core/changelog.d/20250123_183556_huong_li_nguyen_fix_css_nav_links.md
@@ -0,0 +1,48 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Highlights ✨
+
+- A bullet item for the Highlights ✨ category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Added
+
+- A bullet item for the Added category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Changed
+
+- A bullet item for the Changed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+
+### Fixed
+
+- Fix coloring of `NavLink` inside `NavBar`. ([#968](https://github.com/mckinsey/vizro/pull/968))
+
+
+<!--
+### Security
+
+- A bullet item for the Security category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX. ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
diff --git a/vizro-core/examples/dev/assets/css/custom.css b/vizro-core/examples/dev/assets/css/custom.css
@@ -23,7 +23,7 @@
   background: var(--text-primary);
   border-top-left-radius: 8px;
   bottom: 0;
-  color: var(--text-primary-inverted);
+  color: var(--text-primary-inverted) !important;
   display: flex;
   font-size: 0.8rem;
   font-weight: 500;

diff --git a/vizro-core/examples/visual-vocabulary/assets/css/custom.css b/vizro-core/examples/visual-vocabulary/assets/css/custom.css
@@ -94,7 +94,7 @@ img[src*="#chart-icon"] {
   background: var(--text-primary);
   border-top-left-radius: 8px;
   bottom: 0;
-  color: var(--text-primary-inverted);
+  color: var(--text-primary-inverted) !important;
   display: flex;
   font-size: 0.8rem;
   font-weight: 500;

diff --git a/vizro-core/src/vizro/static/css/bootstrap_overwrites.css b/vizro-core/src/vizro/static/css/bootstrap_overwrites.css
@@ -28,6 +28,16 @@ All the HEX values starting with --text-code are taken from the Github code high
   --collapse-icon-bg: var(--primary-300);
 }
 
+/* This is currently required as dbc.NavBar comes with the `navbar-light` class even on a dark theme */
+.nav-link {
+   color: var(--text-secondary) !important;
+}
+
+.nav-link:active, .nav-link.active {
+    color: var(--text-primary) !important;
+}
+
+
 /* CARDS */
 .card {
   height: 100%;