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

Jump to bottom

Responsive height main navigation #502

Closed
wants to merge 4 commits into from
Closed

Responsive height main navigation #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a4872b
[FEATURE] nav-height-md variable for separating mobile nav-height wit…
pxamike Apr 5, 2019
0f60237
[TASK] - fixed vertical positioning of language-menu checkbox in main…
pxamike Apr 9, 2019
3eea729
[CHORE] grunt production
pxamike Apr 9, 2019
ed52e3d
[CHORE] reverted to compileLess && compileCss (minus uglify)
pxamike Apr 10, 2019
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
32 changes: 27 additions & 5 deletions Resources/Public/css/main.css
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Resources/Public/less/bootstrap.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@

// Navigation
@nav-height: 60px;
@nav-height-md: @nav-height; // change to have unique nav-height in desktop
@nav-link-color: #fff;
@nav-link-hover-color: @nav-link-color;
@nav-link-active-color: @main-color;
Expand Down
46 changes: 36 additions & 10 deletions Resources/Public/less/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,6 +2067,7 @@

// Navigation
@nav-height: 60px;
@nav-height-md: @nav-height; // change to have unique nav-height in desktop
@nav-link-color: #fff;
@nav-link-hover-color: @nav-link-color;
@nav-link-active-color: @main-color;
Expand Down Expand Up @@ -2681,25 +2682,42 @@
top: 1px;
}

.main-navigation .header-top__language-menu-btn {
line-height: @nav-height;
}

.main-navigation .header-top__language-menu-box-close-btn {
top: 5px;
height: @nav-height;
}

.main-navigation .header-top__language-menu-btn {
line-height: @nav-height;
@media (min-width: @screen-md-min) {
.main-navigation .header-top__language-menu-btn {
line-height: @nav-height-md;
}

.main-navigation .header-top__language-menu-box-close-btn {
height: @nav-height-md;
}
}

.main-navigation .header-top__language-menu-box {
width: 100%;
height: 100%;
background-color: @nav-background-color;
border-bottom-width: 0;
}

.main-navigation .header-top__language-menu-box .header-top__language-menu-box-item {
color: @nav-link-color;
line-height: @nav-height;
}

@media (min-width: @screen-md-min) {
.main-navigation .header-top__language-menu-box .header-top__language-menu-box-item {
line-height: @nav-height-md;
}
}

.main-navigation .header-top__language-menu {
display: none;
}
Expand All @@ -2710,7 +2728,6 @@
}

._header-top-search-btn .main-navigation__search-btn {
// height: 50px;
height: @header-top-height;
}

Expand Down Expand Up @@ -2747,6 +2764,7 @@
opacity: 0;
visibility: hidden;
transition: opacity 0.3s 0s, visibility 0s 0.3s;
height: @nav-height;
}

.main-navigation__search-box._header-top-search-btn._search-box-visible {
Expand Down Expand Up @@ -3023,7 +3041,7 @@
}

.main-navigation-fixed .header {
padding-bottom: @nav-height;
padding-bottom: @nav-height-md;
}

.main-navigation__items-wrp {
Expand Down Expand Up @@ -3063,6 +3081,7 @@

.main-navigation__item-link {
border: none;
line-height: @nav-height-md;
}

.main-navigation__open-sub-menu-link {
Expand Down Expand Up @@ -3159,7 +3178,7 @@
color: @nav-link-arrow-color;
position: relative;
font-size: 30px;
line-height: @nav-height;
line-height: @nav-height-md;
top: auto;
left: auto;
margin: 0;
Expand Down Expand Up @@ -3236,6 +3255,12 @@
-webkit-tap-highlight-color: rgba(120, 120, 120, 0.3);
}

@media (min-width: @screen-md-min) {
.main-navigation__search-btn {
height: @nav-height-md;
}
}

.main-navigation__search-btn:after,
.main-navigation__search-btn:before {
content: '';
Expand Down Expand Up @@ -3416,6 +3441,7 @@
opacity: 0;
visibility: hidden;
transition: opacity 0.3s 0s, visibility 0s 0.3s;
height: @nav-height-md;
}
}

Expand Down Expand Up @@ -8765,7 +8791,7 @@ div.awesomplete li[aria-selected="true"] mark {
._dropdown-menu-with-columns .main-navigation__item._sub.open > .main-navigation__item-link:before {
content: '';
position: absolute;
top: 52px;
bottom: 0;
left: 50%;
margin-left: -8px;
width: 0;
Expand All @@ -8782,8 +8808,8 @@ div.awesomplete li[aria-selected="true"] mark {
}

.touch ._dropdown-menu-with-columns .tablet-arrow .main-navigation__open-sub-menu-link {
top: -@nav-height;
height: @nav-height;
top: -@nav-height-md;
height: @nav-height-md;
}

.touch ._dropdown-menu-with-columns .main-navigation__item._sub._open-tablet-dropdown > .main-navigation__item-link {
Expand All @@ -8797,7 +8823,7 @@ div.awesomplete li[aria-selected="true"] mark {
.touch ._dropdown-menu-with-columns .main-navigation__item._sub._open-tablet-dropdown > .main-navigation__item-link:before {
content: '';
position: absolute;
top: 52px;
bottom: 0;
left: 50%;
margin-left: -8px;
width: 0;
Expand Down
1 change: 1 addition & 0 deletions felayout_t3kit/dev/styles/customVariables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

// Navigation
@nav-height: 60px;
@nav-height-md: @nav-height; // change to have unique nav-height in desktop
@nav-link-color: #fff;
@nav-link-hover-color: @nav-link-color;
@nav-link-active-color: @main-color;
Expand Down
37 changes: 31 additions & 6 deletions felayout_t3kit/dev/styles/main/header/header.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,25 +383,42 @@
top: 1px;
}

.main-navigation .header-top__language-menu-btn {
line-height: @nav-height;
}

.main-navigation .header-top__language-menu-box-close-btn {
top: 5px;
height: @nav-height;
}

.main-navigation .header-top__language-menu-btn {
line-height: @nav-height;
@media (min-width: @screen-md-min) {
.main-navigation .header-top__language-menu-btn {
line-height: @nav-height-md;
}

.main-navigation .header-top__language-menu-box-close-btn {
height: @nav-height-md;
}
}

.main-navigation .header-top__language-menu-box {
width: 100%;
height: 100%;
background-color: @nav-background-color;
border-bottom-width: 0;
}

.main-navigation .header-top__language-menu-box .header-top__language-menu-box-item {
color: @nav-link-color;
line-height: @nav-height;
}

@media (min-width: @screen-md-min) {
.main-navigation .header-top__language-menu-box .header-top__language-menu-box-item {
line-height: @nav-height-md;
}
}

.main-navigation .header-top__language-menu {
display: none;
}
Expand All @@ -412,7 +429,6 @@
}

._header-top-search-btn .main-navigation__search-btn {
// height: 50px;
height: @header-top-height;
}

Expand Down Expand Up @@ -449,6 +465,7 @@
opacity: 0;
visibility: hidden;
transition: opacity 0.3s 0s, visibility 0s 0.3s;
height: @nav-height;
}

.main-navigation__search-box._header-top-search-btn._search-box-visible {
Expand Down Expand Up @@ -725,7 +742,7 @@
}

.main-navigation-fixed .header {
padding-bottom: @nav-height;
padding-bottom: @nav-height-md;
}

.main-navigation__items-wrp {
Expand Down Expand Up @@ -765,6 +782,7 @@

.main-navigation__item-link {
border: none;
line-height: @nav-height-md;
}

.main-navigation__open-sub-menu-link {
Expand Down Expand Up @@ -861,7 +879,7 @@
color: @nav-link-arrow-color;
position: relative;
font-size: 30px;
line-height: @nav-height;
line-height: @nav-height-md;
top: auto;
left: auto;
margin: 0;
Expand Down Expand Up @@ -938,6 +956,12 @@
-webkit-tap-highlight-color: rgba(120, 120, 120, 0.3);
}

@media (min-width: @screen-md-min) {
.main-navigation__search-btn {
height: @nav-height-md;
}
}

.main-navigation__search-btn:after,
.main-navigation__search-btn:before {
content: '';
Expand Down Expand Up @@ -1118,6 +1142,7 @@
opacity: 0;
visibility: hidden;
transition: opacity 0.3s 0s, visibility 0s 0.3s;
height: @nav-height-md;
}
}

Expand Down
8 changes: 4 additions & 4 deletions felayout_t3kit/dev/styles/main/nav/dropdownMenuWithColumns.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
._dropdown-menu-with-columns .main-navigation__item._sub.open > .main-navigation__item-link:before {
content: '';
position: absolute;
top: 52px;
bottom: 0;
left: 50%;
margin-left: -8px;
width: 0;
Expand All @@ -81,8 +81,8 @@
}

.touch ._dropdown-menu-with-columns .tablet-arrow .main-navigation__open-sub-menu-link {
top: -@nav-height;
height: @nav-height;
top: -@nav-height-md;
height: @nav-height-md;
}

.touch ._dropdown-menu-with-columns .main-navigation__item._sub._open-tablet-dropdown > .main-navigation__item-link {
Expand All @@ -96,7 +96,7 @@
.touch ._dropdown-menu-with-columns .main-navigation__item._sub._open-tablet-dropdown > .main-navigation__item-link:before {
content: '';
position: absolute;
top: 52px;
bottom: 0;
left: 50%;
margin-left: -8px;
width: 0;
Expand Down