Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Navbar: Add CSS var #1422

Merged
merged 4 commits into from
Oct 17, 2022
Merged

Navbar: Add CSS var #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fa3fbc
Adding some CSS vars to Navbars
louismaximepiton Jul 27, 2022
b45e87a
Adding CSS var to Orange Navbars
louismaximepiton Jul 27, 2022
f0d5a81
Fix bug for light navbar
louismaximepiton Jul 27, 2022
9840707
Merge remote-tracking branch 'origin/main' into main-lmp-navbar-fix-c…
louismaximepiton Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions scss/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// scss-docs-start navbar-css-vars
--#{$prefix}navbar-padding-x: #{if($navbar-padding-x == null, 0, $navbar-padding-x)};
--#{$prefix}navbar-padding-y: 0; // Boosted mod: no padding in small breakpoints
--#{$prefix}navbar-font-weight: #{$navbar-font-weight}; // Boosted mod
--#{$prefix}navbar-border-width: #{$navbar-border-width}; // Boosted mod
--#{$prefix}navbar-border-color: #{$navbar-border-color}; // Boosted mod
--#{$prefix}navbar-color: #{$navbar-light-color};
Expand Down Expand Up @@ -36,6 +37,7 @@
--#{$prefix}navbar-toggler-padding-x: #{$navbar-toggler-padding-x};
--#{$prefix}navbar-toggler-font-size: #{$navbar-toggler-font-size-xs}; // Boosted mod
--#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-light-toggler-icon-bg-small)}; // Boosted mod
--#{$prefix}navbar-toggler-icon-filter: none; // Boosted mod
--#{$prefix}navbar-toggler-border-color: #{$navbar-light-toggler-border-color};
--#{$prefix}navbar-toggler-border-radius: #{$navbar-toggler-border-radius};
--#{$prefix}navbar-toggler-focus-width: #{$navbar-toggler-focus-width};
Expand All @@ -49,7 +51,7 @@
justify-content: space-between; // space out brand from logo
padding: var(--#{$prefix}navbar-padding-y) var(--#{$prefix}navbar-padding-x);
// Boosted mod
font-weight: $font-weight-bold;
font-weight: var(--#{$prefix}navbar-font-weight);
box-shadow: inset 0 calc(-1 * var(--#{$prefix}navbar-border-width)) 0 var(--#{$prefix}navbar-border-color); /* stylelint-disable-line function-disallowed-list */
@include transition($navbar-transition);
// End mod
Expand Down Expand Up @@ -162,7 +164,7 @@
// scss-docs-start navbar-nav-css-vars
--#{$prefix}nav-link-padding-x: var(--#{$prefix}navbar-nav-link-padding-x); // Boosted mod
--#{$prefix}nav-link-padding-y: var(--#{$prefix}navbar-nav-link-padding-y); // Boosted mod
@include rfs($nav-link-font-size, --#{$prefix}nav-link-font-size);
@include rfs(var(--#{$prefix}navbar-nav-font-size, $font-size-base), --#{$prefix}nav-link-font-size); // Boosted mod
--#{$prefix}nav-link-font-weight: #{$nav-link-font-weight};
--#{$prefix}nav-link-color: var(--#{$prefix}navbar-color);
--#{$prefix}nav-link-hover-color: var(--#{$prefix}navbar-hover-color);
Expand All @@ -173,7 +175,6 @@
flex-direction: column; // cannot use `inherit` to get the `.navbar`s value
padding: var(--#{$prefix}navbar-nav-padding-top) var(--#{$prefix}navbar-nav-padding-x) var(--#{$prefix}navbar-nav-padding-bottom); // Boosted mod
margin-bottom: 0;
@include font-size(var(--#{$prefix}navbar-nav-font-size, $font-size-base)); // Boosted mod
line-height: var(--#{$prefix}navbar-nav-line-height, $line-height-base); // Boosted mod
letter-spacing: var(--#{$prefix}navbar-nav-letter-spacing, $letter-spacing-base); // Boosted mod
list-style: none;
Expand All @@ -198,8 +199,8 @@
border-top: var(--#{$prefix}navbar-border-width) solid var(--#{$prefix}navbar-border-color);

.badge {
padding: $navbar-badge-padding-y $navbar-badge-padding-x;
margin-top: $navbar-badge-margin-top;
--#{$prefix}badge-padding: #{$navbar-badge-padding-y $navbar-badge-padding-x};
margin-top: $navbar-badge-margin-top; // stay in Scss because no need of CSS var
}

.nav-link.nav-icon {
Expand Down Expand Up @@ -315,14 +316,14 @@
}

// Boosted mod: close icon when opened & color state
&:hover .navbar-toggler-icon,
&:focus .navbar-toggler-icon,
&:active .navbar-toggler-icon {
filter: $orange-filter;
&:hover,
&:focus,
&:active {
--#{$prefix}navbar-toggler-icon-filter: #{$orange-filter};
}

&[aria-expanded="true"] .navbar-toggler-icon {
background-image: escape-svg($navbar-toggler-icon-close-bg);
&[aria-expanded="true"] {
--#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-toggler-icon-close-bg)};
}

&.collapsed {
Expand All @@ -339,6 +340,7 @@
height: 1.5em;
vertical-align: middle;
background-image: var(--#{$prefix}navbar-toggler-icon-bg);
filter: var(--#{$prefix}navbar-toggler-icon-filter); // Boosted mod
background-repeat: no-repeat;
background-position: center;
background-size: 100%;
Expand Down Expand Up @@ -514,11 +516,6 @@
--#{$prefix}navbar-brand-hover-color: #{$navbar-dark-brand-hover-color};
--#{$prefix}navbar-toggler-border-color: #{$navbar-dark-toggler-border-color};
// Boosted mod: No --#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-dark-toggler-icon-bg)}; since we handle the variant with filter
--#{$prefix}navbar-toggler-icon-filter: #{$invert-filter}; // Boosted mod
// scss-docs-end navbar-dark-css-vars

// Boosted mod
.navbar-toggler-icon {
filter: $invert-filter;
}
// End mod
}
14 changes: 6 additions & 8 deletions scss/_orange-navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
.supra {
// scss-docs-start supra-navbar-css-vars
--#{$prefix}navbar-padding-y: 0px; /* stylelint-disable-line length-zero-no-unit */
--#{$prefix}navbar-nav-font-size: #{$font-size-sm};
--#{$prefix}navbar-nav-line-height: #{$line-height-sm};
--#{$prefix}navbar-nav-link-padding-y: #{$navbar-supra-link-padding-y};
--#{$prefix}navbar-nav-link-padding-x: #{$navbar-supra-link-padding-x};
--#{$prefix}navbar-nav-icon-padding-y: #{$navbar-supra-icon-padding-y};
Expand All @@ -14,15 +16,11 @@

display: none;

.navbar-nav {
.nav-link {
padding-top: var(--#{$prefix}navbar-nav-link-padding-y);
font-size: $font-size-sm;
line-height: $line-height-sm;
.navbar-nav .nav-link {
padding-top: var(--#{$prefix}navbar-nav-link-padding-y);

&.nav-icon {
padding-top: add(var(--#{$prefix}navbar-nav-icon-padding-y), .3125rem);
}
&.nav-icon {
padding-top: add(var(--#{$prefix}navbar-nav-icon-padding-y), .3125rem);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,7 @@ $nav-pills-link-active-bg: $component-active-bg !default;
// scss-docs-start navbar-variables
$navbar-padding-y: .375rem !default; // Boosted mod
$navbar-padding-x: null !default;
$navbar-font-weight: $font-weight-bold !default; // Boosted mod

$navbar-nav-link-padding-y: 1rem !default; // Boosted mod
$navbar-nav-link-padding-x-xs: $spacer * .25 !default; // Boosted mod
Expand Down