Skip to content

Commit 2179c6e

Browse files
authored
Nav bug fix (#15171)
1 parent 278e58f commit 2179c6e

File tree

1 file changed

+36
-18
lines changed

1 file changed

+36
-18
lines changed

media/css/m24/components/navigation-refresh.scss

+36-18
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
}
116116
}
117117

118-
@media(min-width: $screen-lg) {
118+
@media #{$mq-lg} {
119119
&::after {
120120
bottom: 7px;
121121
left: 0;
@@ -161,6 +161,7 @@
161161
color: $color-black;
162162
position: relative;
163163
font-family: $primary-font;
164+
font-weight: 600;
164165

165166
&::after {
166167
display: block;
@@ -185,7 +186,7 @@
185186
width: fit-content;
186187
}
187188

188-
@media (min-width: $screen-md) {
189+
@media #{$mq-md} {
189190
margin: 24px 0;
190191
}
191192
}
@@ -195,7 +196,7 @@
195196
background-color: $color-white;
196197
color: $color-black;
197198

198-
@media (min-width: $screen-md) {
199+
@media #{$mq-md} {
199200
left: 0;
200201
right: auto;
201202
top: 64px;
@@ -210,7 +211,7 @@
210211
max-width: unset;
211212
box-shadow: none;
212213

213-
@media (min-width: $screen-md) {
214+
@media #{$mq-md} {
214215
border-radius: 0;
215216
padding: $spacer-lg 0;
216217
}
@@ -221,7 +222,7 @@
221222
border: transparent;
222223
padding: 8px 16px;
223224

224-
@media (min-width: $screen-md) {
225+
@media #{$mq-md} {
225226
padding: 0;
226227
}
227228

@@ -233,7 +234,7 @@
233234
min-width: 100%;
234235
background-color: $color-white;
235236

236-
@media (min-width: $screen-md) {
237+
@media #{$mq-md} {
237238
position: unset;
238239
min-width: unset;
239240
}
@@ -242,7 +243,7 @@
242243
border-bottom: transparent;
243244
padding: 0 0 0 48px;
244245

245-
@media (min-width: $screen-md) {
246+
@media #{$mq-md} {
246247
color: $m24-color-dark-green;
247248
border-bottom: transparent;
248249
padding: 0;
@@ -276,9 +277,10 @@
276277
margin-top: 98px;
277278
animation: nav-slide-in 0.45s ease;
278279

279-
@media (min-width: $screen-md) {
280+
@media #{$mq-md} {
280281
margin-top: 64px;
281282
animation: none;
283+
max-height: calc(100vh - 64px);
282284
}
283285
}
284286
}
@@ -290,7 +292,7 @@
290292
display: none;
291293
}
292294

293-
@media (min-width: $screen-md) {
295+
@media #{$mq-md} {
294296
padding: 0;
295297
}
296298
}
@@ -306,7 +308,7 @@
306308
min-width: unset;
307309
padding: $spacer-md 0;
308310

309-
@media (min-width: $screen-md) {
311+
@media #{$mq-md} {
310312
padding: 0;
311313
}
312314
}
@@ -316,7 +318,7 @@
316318
max-width: 100%;
317319
padding: 0;
318320

319-
@media (min-width: $screen-md) {
321+
@media #{$mq-md} {
320322
min-width: 216px;
321323
width: auto;
322324
}
@@ -395,15 +397,15 @@
395397
margin: 0 auto;
396398
padding: $spacer-md $grid-margin;
397399

398-
@media (min-width: $screen-md) {
400+
@media #{$mq-md} {
399401
padding: 0 $grid-margin;
400402
}
401403

402404
& > li {
403405
border-bottom: 2px solid transparent;
404406
width: 100%;
405407

406-
@media (min-width: $screen-md) {
408+
@media #{$mq-md} {
407409
border-bottom: 2px solid $token-color-light-gray;
408410
}
409411

@@ -456,6 +458,8 @@
456458
}
457459

458460
.mzp-has-icon .c-menu-item-link {
461+
@include bidi(((padding-right, 0, 0), (padding-left, 0, 0)));
462+
459463
.c-menu-item-icon {
460464
height: 16px;
461465
width: 16px;
@@ -497,26 +501,40 @@
497501
}
498502
}
499503

504+
.c-menu-button-close {
505+
@media #{$mq-md} {
506+
display: block;
507+
top: 15px;
508+
@include bidi(((right, 15px, left, auto), (left, auto, right, 15px)));
509+
510+
&:hover,
511+
&:focus,
512+
&:active {
513+
top: 15px;
514+
}
515+
}
516+
}
517+
500518
.c-menu.mzp-is-enhanced .c-menu-category.c-menu-category-has-icon {
501519
.c-menu-title-icon {
502-
margin-right: 8px;
520+
@include bidi(((margin-right, 8px, 0), (margin-left, 0, 8px)));
503521
}
504522

505523
.c-menu-title::after {
506524
bottom: 7px;
507-
left: 24px;
525+
@include bidi(((left, 24px, right, auto), (right, auto, left, 24px)));
508526
width: calc(100% - 24px);
509527
}
510528
}
511529
}
512530

513531
// page content
514-
// page content here is not part of Protocol, it is specifc to Bedrock; should be documented in future
532+
// This is not part of Protocol, it is specifc to Bedrock; should be documented in future
515533
body:has(.c-navigation-items.mzp-is-open) {
516534
#outer-wrapper {
517535
display: none;
518536

519-
@media (min-width: $screen-md) {
537+
@media #{$mq-md} {
520538
display: block;
521539
}
522540
}
@@ -525,7 +543,7 @@ body:has(.c-navigation-items.mzp-is-open) {
525543
#outer-wrapper {
526544
margin-top: 48px;
527545

528-
@media (min-width: $screen-md) {
546+
@media #{$mq-md} {
529547
margin-top: 0;
530548
}
531549
}

0 commit comments

Comments
 (0)