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

refactor: simple explicit header nav link padding #462

Merged
merged 5 commits into from
Mar 1, 2025
+41 −22
Merged

refactor: simple explicit header nav link padding #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34b2882
fix: some header styles not scoped with .s-header
wesleyboar Mar 1, 2025
4dfe231
fix: different rems give diff header spacing
wesleyboar Mar 1, 2025
c454331
refactor: header__nav-link--tall → …--not-expanded
wesleyboar Mar 1, 2025
22a586c
refactor: simplify header navlink padding
wesleyboar Mar 1, 2025
44e0446
fix: padding-block should differ for expand v. not
wesleyboar Mar 1, 2025
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
2 changes: 1 addition & 1 deletion dist/core-styles.header.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/trumps/s-header.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 39 additions & 20 deletions src/lib/_imports/trumps/s-header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,11 @@ Styleguide Trumps.Scopes.Header

/* If link text uses 2 lines, header grows taller (but it must not do so) */
white-space: nowrap;

padding-inline: 14px;
}

@define-mixin header__nav-link--tall {
@define-mixin header--not-expanded {
&.s-header .nav-item {
display: flex;
}
Expand All @@ -116,19 +118,39 @@ Styleguide Trumps.Scopes.Header

/* To align the underline of a hovered link to bottom of header */
height: calc(100% + var(--nav-padding-vert) + var(--header-major-border-width));

padding-block: 5px;
}
}
@media (--x-narrow-and-above) {
.navbar-expand-sm { @mixin header__nav-link--tall; }
.navbar-expand-sm { @mixin header--not-expanded; }
}
@media (--narrow-and-above) {
.navbar-expand-md { @mixin header__nav-link--tall; }
.navbar-expand-md { @mixin header--not-expanded; }
}
@media (--medium-and-above) {
.navbar-expand-lg { @mixin header__nav-link--tall; }
.navbar-expand-lg { @mixin header--not-expanded; }
}
@media (--wide-and-above) {
.navbar-expand-xl { @mixin header__nav-link--tall; }
.navbar-expand-xl { @mixin header--not-expanded; }
}

@define-mixin header--is-expanded {
&.s-header .nav-link {
padding-block: 8px;
}
}
@media (--x-narrow-and-below) {
.navbar-expand-sm { @mixin header--is-expanded; }
}
@media (--narrow-and-below) {
.navbar-expand-md { @mixin header--is-expanded; }
}
@media (--medium-and-below) {
.navbar-expand-lg { @mixin header--is-expanded; }
}
@media (--wide-and-below) {
.navbar-expand-xl { @mixin header--is-expanded; }
}

.s-header .nav-link:hover,
Expand All @@ -144,19 +166,6 @@ Styleguide Trumps.Scopes.Header
color: var(--header-text-color);
}

/* Navigation: Links: Responsive Design */

/* Tweak Bootstrap `_nav.scss` (which selects via `navbar-expand-` class) */
.s-header[class*="navbar-expand-"] .navbar-nav .nav-link {
padding-right: 14px; /* NO-R/EM: .875rem (overwrite Bootstrap) */
padding-left: 14px; /* NO-R/EM: .875rem (overwrite Bootstrap) */
}

@media (--medium-and-below) {
.s-header[class*="navbar-expand-"] .navbar-nav .nav-link {
padding-block: 8px;
}
}

/* Search */

Expand All @@ -170,9 +179,19 @@ Styleguide Trumps.Scopes.Header

/* Dropdown */

.dropdown-menu {
/* To ensure sizes match between clients with different rem value */
/* FAQ: Bootstrap uses rem space values but CMS and Portal rem values differ */
.s-header .dropdown-menu {
font-size: 16px; /* NO-R/EM: 1rem (from Bootstrap via `.dropdown-menu`) */
}
/* - to match portal nav size */
.s-header .dropdown-menu {
padding-block: 5px;
}
.s-header .dropdown-item {
padding-block: 2.5px;
padding-inline: 15px;
}

/* Icons */

Expand Down Expand Up @@ -226,6 +245,6 @@ Styleguide Trumps.Scopes.Header
```
*/

.navbar-toggler-icon  {
.s-header .navbar-toggler-icon {
filter: var(--menu-toggle-icon);
}