Skip to content

Commit d0c2a45

Browse files
fix: pfe-navigation cta overlap bug (#766)
* set ie grid rows and columns, set justify-content space-between for ctas * increased padding in tray footer to 40px top and bottom * fixed spacing beneath ctas in the tray * Removed the second grid row from the nav footer * set nav footer columns to flex display * Updated changelog. Co-authored-by: [ Cassondra ] <[email protected]>
1 parent eb4a9f6 commit d0c2a45

File tree

2 files changed

+37
-17
lines changed

2 files changed

+37
-17
lines changed

CHANGELOG-prerelease.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Tag: [v1.0.0-prerelease.40](https://github.com/patternfly/patternfly-elements/releases/tag/v1.0.0-prerelease.40)
44

5-
- [ ]( ) fix: Prevent default pfe-cta arrow from wrapping to a new line by itself (#679)
5+
- [7deb9bb](https://github.com/patternfly/patternfly-elements/commit/7deb9bb6227c0560b60a665ecd43b450db0f90e1) fix: Prevent default pfe-cta arrow from wrapping to a new line by itself (#679)
6+
- [](https://github.com/patternfly/patternfly-elements/commit/) fix: pfe-navigation cta overlap bug in IE11 (#766)
67

78

89
## Prerelease 39 ( 2020-02-19 )

elements/pfe-navigation/src/pfe-navigation--lightdom.scss

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ $variables: map-merge($variables, $nav-light-dom-variables);
166166
pfe-navigation [slot="logo"] {
167167
max-width: 100%;
168168
}
169+
.pfe-navigation--footer .pfe-navigation--column {
170+
@media (min-width: #{pfe-breakpoint(md)}) {
171+
display: flex;
172+
align-items: center;
173+
}
174+
}
169175
}
170176

171177
@include browser-query(edge) {
@@ -270,6 +276,12 @@ $variables: map-merge($variables, $nav-light-dom-variables);
270276
.pfe-navigation__logo {
271277
margin-right: 20px; // Account for collapsed padding-right: 20px;
272278
}
279+
.pfe-navigation--footer .pfe-navigation--column {
280+
@media (min-width: #{pfe-breakpoint(md)}) {
281+
display: flex;
282+
align-items: center;
283+
}
284+
}
273285
}
274286

275287
pfe-navigation [slot="logo"] {
@@ -380,49 +392,44 @@ pfe-navigation-item {
380392
}
381393
}
382394
&--footer:not(:empty) {
383-
margin: calc(#{pfe-var(container-spacer, $fallback: 16px)} * 2) 0 10px !important;
395+
margin: calc(#{pfe-var(container-padding, $fallback: 16px)} * 2) 0 calc(#{pfe-var(container-padding, $fallback: 16px)} * 1.5);
384396
border-top: 1px solid lightgray;
385-
padding: calc(#{pfe-var(container-spacer, $fallback: 16px)} * 2) 0 0;
397+
padding: calc(#{pfe-var(container-padding, $fallback: 16px)} * 2.5) 0 0;
386398

387399
>*:not(:last-child) {
388400
margin-bottom: 32px;
389401
}
390402

391403
>* {
392-
flex: 45%;
404+
flex: 0 1 45%;
393405
}
394406

395407
@media (min-width: #{pfe-breakpoint(sm)}) {
396408
display: flex;
397409
flex-wrap: wrap;
398-
align-items: baseline;
410+
align-items: center;
411+
justify-content: space-between;
399412

400413
>*:not(:last-child) {
401414
margin-bottom: 0;
402415
}
403416

404-
>*:nth-child(3) {
417+
>*:nth-child(3),
418+
>*:nth-child(4) {
405419
margin-top: 32px;
406420
}
407421
}
408422

423+
@media (min-width: #{pfe-breakpoint(md)}) {
424+
justify-content: flex-start;
425+
}
426+
409427
@media (min-width: #{pfe-breakpoint(lg)}) {
410428
// Not setting grid prefix here since IE doesn't support auto-flow
411429
display: grid;
412430
grid-gap: 32px;
413431
grid-auto-flow: column;
414-
415-
>*:nth-child(3) {
416-
margin-top: 0;
417-
}
418-
}
419-
420-
@media (min-width: #{pfe-breakpoint(xl)}) {
421-
padding-bottom: 0;
422-
display: -ms-grid;
423-
grid-template-columns: repeat(4, 1fr);
424432
-ms-grid-columns: 1fr 1fr 1fr 1fr;
425-
align-items: center;
426433

427434
.pfe-navigation--column:nth-child(1) {
428435
-ms-grid-column: 1;
@@ -438,8 +445,20 @@ pfe-navigation-item {
438445

439446
.pfe-navigation--column:nth-child(4) {
440447
-ms-grid-column: 4;
448+
}
449+
450+
>*:nth-child(3),
451+
>*:nth-child(4) {
452+
margin-top: 0;
441453
}
442454
}
455+
456+
@media (min-width: #{pfe-breakpoint(xl)}) {
457+
padding-bottom: 0;
458+
display: -ms-grid;
459+
grid-template-columns: repeat(4, 1fr);
460+
-ms-grid-columns: 1fr 1fr 1fr 1fr;
461+
}
443462
}
444463
}
445464

0 commit comments

Comments
 (0)