merge from develop to fix header nav view #67
File diff suppressed because one or more lines are too long
|
@ -21,6 +21,7 @@
|
||||||
@include xy-cell(12);
|
@include xy-cell(12);
|
||||||
@include flex;
|
@include flex;
|
||||||
@include flex-align(center, middle);
|
@include flex-align(center, middle);
|
||||||
|
padding-bottom: $global-padding*2;
|
||||||
a, button {
|
a, button {
|
||||||
color: $black;
|
color: $black;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
@ -56,20 +57,43 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@include breakpoint(large) {
|
@include breakpoint(medium) {
|
||||||
@include xy-cell(auto);
|
@include xy-cell(auto);
|
||||||
@include flex;
|
@include flex;
|
||||||
@include flex-align(right, middle);
|
//@include flex-align(right, middle);
|
||||||
padding-bottom: 0;//$global-padding;
|
//padding-bottom: 0;//$global-padding;
|
||||||
menu {
|
menu {
|
||||||
margin: inherit;
|
margin: inherit;
|
||||||
padding: inherit;
|
padding: inherit;
|
||||||
|
.menu {
|
||||||
|
&.dropdown {
|
||||||
|
li,.button {
|
||||||
|
font-size: $global-font-size*1.4;//$header-menu-font-size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.button {
|
||||||
|
margin-left: $global-margin/2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@include breakpoint(xlarge) {
|
||||||
|
// @include xy-cell(auto);
|
||||||
|
// @include flex;
|
||||||
|
@include flex-align(right, middle);
|
||||||
|
padding-bottom: 0;//$global-padding;
|
||||||
|
menu {
|
||||||
|
// margin: inherit;
|
||||||
|
// padding: inherit;
|
||||||
.menu {
|
.menu {
|
||||||
&.dropdown {
|
&.dropdown {
|
||||||
justify-content: end;
|
justify-content: end;
|
||||||
li,.button {
|
li,.button {
|
||||||
font-size: $global-font-size*1.4;//$header-menu-font-size;
|
font-size: $global-font-size*1.4;//$header-menu-font-size;
|
||||||
}
|
}
|
||||||
|
.button {
|
||||||
|
margin-left: $global-margin;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue