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.

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

DP-19331 Set the nav bar height consistent in any screen sizes #1115

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
8734dfd
test edit
ygannett Jun 22, 2020
02b838d
fix the dropdown visibility to keybord and screen readers maintaiing …
ygannett Jun 23, 2020
2507f0a
fix the dropdown visibility to keybord and screen readers maintaiing …
ygannett Jun 23, 2020
0730bb2
comment out the condition causing the keyboard trap issue with the me…
ygannett Jun 23, 2020
8d9572f
correct aria-hidden placement for the dropdown
ygannett Jun 23, 2020
5a6826d
add jumpToSearch functioin
ygannett Jun 23, 2020
0d0f807
disable mainNavMixed.js to avoid override mainNavHamburger.js
ygannett Jun 23, 2020
bda9cc5
menu button label edit
ygannett Jun 24, 2020
6ec0695
add chevron to direct link in main nav top level
ygannett Jun 24, 2020
3d98228
correct aria-hidden for + icon container
ygannett Jun 24, 2020
ab49672
clean up menu button label variables
ygannett Jun 24, 2020
a48cecc
adjust icons for link and button in hamburger menu
ygannett Jun 24, 2020
4057fe4
separate hamburger utility nav style from utility-nav.scss
ygannett Jun 24, 2020
48b1002
match utility nav in hamburger menu to main nav style
ygannett Jun 25, 2020
5033587
add open/close behavior to util nav in hamburger menu
ygannett Jun 25, 2020
24dae23
separate hamburger nav utlity nav style separate from utility-nav.scss
ygannett Jun 25, 2020
4453653
resolve merge conflicts.
ygannett Jun 25, 2020
f43df8d
reverting merge conflict fix 1
ygannett Jun 25, 2020
1db8f8f
reverting merge conflict fix 2
ygannett Jun 25, 2020
34aa491
fix search access icon in page view
ygannett Jun 25, 2020
bf18c97
Merge branch 'patternlab/DP-17154_header-change-with-new-global-nav_m…
ygannett Jun 25, 2020
c1f968a
fix lint errors
ygannett Jun 25, 2020
8f511ea
Merge branch 'patternlab/DP-17200-add-horizontal-nav-code-branch' int…
ygannett Jun 25, 2020
fb12fdb
lint error fix
ygannett Jun 26, 2020
dda53a5
fix the hidden utility content height
ygannett Jun 26, 2020
009f3f8
correct target container for utility content
ygannett Jun 26, 2020
3f03b73
adjust vertical positioning of the menu button text
ygannett Jun 26, 2020
c5bce21
move back original styles belong to utility_nav.scss
ygannett Jun 26, 2020
76bbff6
correct class in utility item
ygannett Jun 28, 2020
ac5a091
set up open/close behaviors for wide/util nav bar 'log in to'
ygannett Jun 28, 2020
1d856ab
set up open/close behaviors for narrow/hamburger menu 'log in to
ygannett Jun 29, 2020
b3304ff
fix conflict between 'log in to' buttons
ygannett Jun 29, 2020
20395e6
uncomment test style
ygannett Jun 29, 2020
c7db7fb
set focus between menu button, hamburger menu container, jump to sear…
ygannett Jun 29, 2020
1f6f52d
Merge branch 'patternlab/DP-17200-add-horizontal-nav-code-branch' int…
ygannett Jun 29, 2020
29ffbc8
test edit
ygannett Jun 29, 2020
b5792f3
Merge branch 'patternlab/DP-17154_header-change-with-new-global-nav' …
ygannett Jun 29, 2020
63d0c12
fix syntax error
ygannett Jun 29, 2020
763c7a6
merge hamburger and mix template and scss to minimize duplicate.
ygannett Jun 29, 2020
46ca761
clean up duplicate
ygannett Jun 30, 2020
4a786f6
merge mainNavMixed.js to mainNavHamburger.js
ygannett Jun 30, 2020
83edf74
fix width for log in to content
ygannett Jun 30, 2020
4f657bb
fix lint errors
ygannett Jun 30, 2020
b919910
lint error fix
ygannett Jun 30, 2020
eeacf43
fix positioning of the hamburger menu container
ygannett Jun 30, 2020
bd21ffb
smooth open/close behavior of log in to content in wide version
ygannett Jun 30, 2020
cc7d506
adjust open/close behavior of log in to content in wide version
ygannett Jun 30, 2020
fb4a547
remove invalid attribute
ygannett Jun 30, 2020
101466b
remove duplicate markup
ygannett Jun 30, 2020
686ef0b
style log in to content in hamburger nav
ygannett Jun 30, 2020
ef8964d
fix error
ygannett Jul 1, 2020
cc565c4
fix errors
ygannett Jul 1, 2020
8c4885a
fix error
ygannett Jul 1, 2020
f007638
test edit
ygannett Jul 1, 2020
230aef7
fix some lint errors in the existing code
ygannett Jul 1, 2020
94e06c0
remove test style
ygannett Jul 1, 2020
d0d452e
resolve conflicts between utilNav.js and mainNavHamburger.js
ygannett Jul 1, 2020
e1b0177
remove duplicate markup
ygannett Jul 1, 2020
d2187ea
fix conflicts between 2 utlity content displays
ygannett Jul 1, 2020
ed832d4
set container size for utility container in hamburger menu on load
ygannett Jul 1, 2020
ef932dd
hide utility nav content when sub menu in main nav is open
ygannett Jul 1, 2020
59b6c25
remove unnecessary aria-label from hamburger main nav
ygannett Jul 1, 2020
bafde18
hide hamburger menu at resizing window in mix
ygannett Jul 1, 2020
483a2f8
Hide hamburger menu when window size is resized to over 840 while ham…
ygannett Jul 1, 2020
0a8ec2a
adjustment for Drupal output
ygannett Jul 2, 2020
08f112d
test edit
ygannett Jul 2, 2020
bbe45a9
add changelog for DP-17154
ygannett Jul 2, 2020
8ded5f6
remove box-shadow from utility nav item in hamburger menu
ygannett Jul 2, 2020
eb6c257
setting up to close sub mneu as opening the utility nav content
ygannett Jul 7, 2020
a10dccc
set up focus on the search box in the hamburger menu by clicking the …
ygannett Jul 8, 2020
baf1fe3
clean up unnecessary tabindex and aria-label
ygannett Jul 8, 2020
13e9e20
fix typo
ygannett Jul 9, 2020
115ef11
setting up closure with esc key
ygannett Jul 9, 2020
5808c5e
adjust focsus issue as menu open/close
ygannett Jul 9, 2020
9ed7041
fix tabindex at closing menu button
ygannett Jul 9, 2020
8a661e4
set the utlity nav bar height consistent regardless screensize
ygannett Jul 9, 2020
482402d
remove test style
ygannett Jul 9, 2020
dbf4de0
add changelog for DP-19331
ygannett Jul 9, 2020
891d964
lint error fix
ygannett Jul 14, 2020
eae45ad
Updating reference screenshots
ygannett Jul 14, 2020
be11355
clean up comments
ygannett Jul 15, 2020
dc6854f
Resolve merge conflicts.
ygannett Jul 23, 2020
595bb25
fix lint error
ygannett Jul 23, 2020
4cb035b
fix for backstop error
ygannett Jul 24, 2020
be5b6d2
Fix indentation.
ygannett Jul 24, 2020
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: 24 additions & 7 deletions assets/scss/03-organisms/_header-hamburger.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$header-mobile-menu-width: 300px;
$header-logo-width: 150px;
$bp-header-logo-min: "min-width: 1000px";
$utility-nav-height: 43px;
$utility-nav-height: 44px;

body.show-menu {
overflow: hidden;
Expand Down Expand Up @@ -80,13 +80,12 @@ body.show-menu {
}

&-wrapper {
height: $utility-nav-height;

@include ma-container;

@media ($bp-medium-min) {

// @include ma-container;

display: flex;
justify-content: space-between;
}
Expand All @@ -95,7 +94,6 @@ body.show-menu {

@media ($bp-header-toggle-max) {

// @include ma-container;
padding-right: 0;
padding-left: 0;
height: $header-mobile-controls-height;
Expand All @@ -112,8 +110,13 @@ body.show-menu {
display: flex;
justify-content: space-between;

@media ($bp-header-toggle-max) {
width: 100%;
// Expand close button to fll the blue bar.

.show-menu & {

@media ($bp-header-toggle-max) {
width: 100%;
}
}
}

Expand Down Expand Up @@ -279,11 +282,20 @@ body.show-menu {
padding-left: 20px;
transition: transform 0.5s ease;

// Expand close button to fll the blue bar.

.show-menu & {

@media ($bp-header-toggle-max) {
width: 100%;
}
}

span:first-child {
opacity: 0.7;
}

@media ($bp-medium-max) {
@media ($bp-header-toggle-max) {

padding-left: 30px;
}
Expand All @@ -292,6 +304,11 @@ body.show-menu {

padding-left: 0;
}

@media ($bp-medium-max) {

padding-left: 20px;
}
}

&__menu-icon {
Expand Down
6 changes: 6 additions & 0 deletions changelogs/DP-19331.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Changed:
- project: Patternlab
component: HeaderHamburgerMenu
description: Set the height of the nav bar consistent regardless of screen sizes. (#1115)
issue: DP-19331
impact: Minor
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.