Skip to content

Commit 85ebf82

Browse files
authored
refactor: simple explicit header nav link padding (#462)
* fix: some header styles not scoped with .s-header * fix: different rems give diff header spacing - has no effect on CMS (tested _in situ_) - has expected effect on Portal (tested in TACC/Core-Portal#1068) * refactor: header__nav-link--tall → …--not-expanded * refactor: simplify header navlink padding * fix: padding-block should differ for expand v. not
1 parent 62dd3ee commit 85ebf82

File tree

3 files changed

+41
-22
lines changed

3 files changed

+41
-22
lines changed

dist/core-styles.header.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/trumps/s-header.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/_imports/trumps/s-header.css

+39-20
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,11 @@ Styleguide Trumps.Scopes.Header
103103

104104
/* If link text uses 2 lines, header grows taller (but it must not do so) */
105105
white-space: nowrap;
106+
107+
padding-inline: 14px;
106108
}
107109

108-
@define-mixin header__nav-link--tall {
110+
@define-mixin header--not-expanded {
109111
&.s-header .nav-item {
110112
display: flex;
111113
}
@@ -116,19 +118,39 @@ Styleguide Trumps.Scopes.Header
116118

117119
/* To align the underline of a hovered link to bottom of header */
118120
height: calc(100% + var(--nav-padding-vert) + var(--header-major-border-width));
121+
122+
padding-block: 5px;
119123
}
120124
}
121125
@media (--x-narrow-and-above) {
122-
.navbar-expand-sm { @mixin header__nav-link--tall; }
126+
.navbar-expand-sm { @mixin header--not-expanded; }
123127
}
124128
@media (--narrow-and-above) {
125-
.navbar-expand-md { @mixin header__nav-link--tall; }
129+
.navbar-expand-md { @mixin header--not-expanded; }
126130
}
127131
@media (--medium-and-above) {
128-
.navbar-expand-lg { @mixin header__nav-link--tall; }
132+
.navbar-expand-lg { @mixin header--not-expanded; }
129133
}
130134
@media (--wide-and-above) {
131-
.navbar-expand-xl { @mixin header__nav-link--tall; }
135+
.navbar-expand-xl { @mixin header--not-expanded; }
136+
}
137+
138+
@define-mixin header--is-expanded {
139+
&.s-header .nav-link {
140+
padding-block: 8px;
141+
}
142+
}
143+
@media (--x-narrow-and-below) {
144+
.navbar-expand-sm { @mixin header--is-expanded; }
145+
}
146+
@media (--narrow-and-below) {
147+
.navbar-expand-md { @mixin header--is-expanded; }
148+
}
149+
@media (--medium-and-below) {
150+
.navbar-expand-lg { @mixin header--is-expanded; }
151+
}
152+
@media (--wide-and-below) {
153+
.navbar-expand-xl { @mixin header--is-expanded; }
132154
}
133155

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

147-
/* Navigation: Links: Responsive Design */
148-
149-
/* Tweak Bootstrap `_nav.scss` (which selects via `navbar-expand-` class) */
150-
.s-header[class*="navbar-expand-"] .navbar-nav .nav-link {
151-
padding-right: 14px; /* NO-R/EM: .875rem (overwrite Bootstrap) */
152-
padding-left: 14px; /* NO-R/EM: .875rem (overwrite Bootstrap) */
153-
}
154-
155-
@media (--medium-and-below) {
156-
.s-header[class*="navbar-expand-"] .navbar-nav .nav-link {
157-
padding-block: 8px;
158-
}
159-
}
160169

161170
/* Search */
162171

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

171180
/* Dropdown */
172181

173-
.dropdown-menu {
182+
/* To ensure sizes match between clients with different rem value */
183+
/* FAQ: Bootstrap uses rem space values but CMS and Portal rem values differ */
184+
.s-header .dropdown-menu {
174185
font-size: 16px; /* NO-R/EM: 1rem (from Bootstrap via `.dropdown-menu`) */
175186
}
187+
/* - to match portal nav size */
188+
.s-header .dropdown-menu {
189+
padding-block: 5px;
190+
}
191+
.s-header .dropdown-item {
192+
padding-block: 2.5px;
193+
padding-inline: 15px;
194+
}
176195

177196
/* Icons */
178197

@@ -226,6 +245,6 @@ Styleguide Trumps.Scopes.Header
226245
```
227246
*/
228247

229-
.navbar-toggler-icon  {
248+
.s-header .navbar-toggler-icon {
230249
filter: var(--menu-toggle-icon);
231250
}

0 commit comments

Comments
 (0)