fix(@clayui/css): nav-underline and navigation-bar-light should use p…

…rimary-l0 for active highlight
liferay · Feb 14, 2023 · fdeb072 · fdeb072
1 parent d76fb5c
commit fdeb072
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/packages/clay-css/src/scss/atlas/variables/_navs.scss b/packages/clay-css/src/scss/atlas/variables/_navs.scss
@@ -84,7 +84,7 @@ $nav-tabs-tab-pane-padding: 2rem !default;
 $nav-underline-link-highlight-left: 0 !default;
 $nav-underline-link-highlight-right: 0 !default;
 
-$nav-underline-link-active-highlight: $primary-l1 !default;
+$nav-underline-link-active-highlight: $primary-l0 !default;
 $nav-underline-link-active-highlight-height: 0.125rem !default; // 2px
 
 // Nav Underline

diff --git a/packages/clay-css/src/scss/cadmin/variables/_navigation-bar.scss b/packages/clay-css/src/scss/cadmin/variables/_navigation-bar.scss
@@ -341,7 +341,23 @@ $cadmin-navigation-bar-light: map-deep-merge(
 				),
 			),
 		),
-		media-breakpoint-up: (),
+		media-breakpoint-up: (
+			md: (
+				navbar-expand-md: (
+					navbar-underline: (
+						navbar-nav: (
+							nav-link: (
+								active-class: (
+									after: (
+										background-color: $cadmin-primary-l0,
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		),
 	),
 	$cadmin-navigation-bar-light
 );

diff --git a/packages/clay-css/src/scss/cadmin/variables/_navs.scss b/packages/clay-css/src/scss/cadmin/variables/_navs.scss
@@ -407,7 +407,7 @@ $cadmin-nav-underline-link-highlight-left: 0 !default;
 $cadmin-nav-underline-link-highlight-right: 0 !default;
 $cadmin-nav-underline-link-highlight-top: null !default;
 
-$cadmin-nav-underline-link-active-highlight: $cadmin-primary-l1 !default;
+$cadmin-nav-underline-link-active-highlight: $cadmin-primary-l0 !default;
 $cadmin-nav-underline-link-active-content: '' !default;
 $cadmin-nav-underline-link-active-highlight-height: 2px !default; // 2px
 

diff --git a/packages/clay-css/src/scss/variables/_navigation-bar.scss b/packages/clay-css/src/scss/variables/_navigation-bar.scss
@@ -122,7 +122,23 @@ $navigation-bar-light: map-deep-merge(
 				),
 			),
 		),
-		media-breakpoint-up: (),
+		media-breakpoint-up: (
+			md: (
+				navbar-expand-md: (
+					navbar-underline: (
+						navbar-nav: (
+							nav-link: (
+								active-class: (
+									after: (
+										background-color: $primary-l0,
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		),
 	),
 	$navigation-bar-light
 );

diff --git a/packages/clay-css/src/scss/variables/_navs.scss b/packages/clay-css/src/scss/variables/_navs.scss
@@ -465,7 +465,7 @@ $nav-underline-link-highlight-left: $nav-link-padding-x * 0.5 !default;
 $nav-underline-link-highlight-right: $nav-link-padding-x * 0.5 !default;
 $nav-underline-link-highlight-top: null !default;
 
-$nav-underline-link-active-highlight: $component-active-bg !default;
+$nav-underline-link-active-highlight: $primary-l0 !default;
 $nav-underline-link-active-content: '' !default;
 $nav-underline-link-active-highlight-height: 0.1875rem !default;