app/assets/stylesheets/material/elements/_header.scss in material-sass-1.1.0 vs app/assets/stylesheets/material/elements/_header.scss in material-sass-1.3.0
- old
+ new
@@ -1,12 +1,10 @@
.header {
backface-visibility: hidden;
background-color: $offwhite-solid;
color: $black-text-solid;
min-height: $header-height;
- padding-top: (($header-height - $nav-height) / 2);
- padding-bottom: (($header-height - $nav-height) / 2);
z-index: $header-base;
&:after {
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.5);
content: "";
display: block;
@@ -25,23 +23,21 @@
a {
color: inherit;
z-index: 1;
}
.nav {
- margin: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+ > li > a,
+ > li > .a {
+ height: $header-height;
+ }
}
.tab-nav {
box-shadow: none;
- margin-top: (($header-height - $nav-height) / -2);
- margin-bottom: (($header-height - $nav-height) / -2);
- .nav > li {
- > a,
- > .a {
- padding-top: (($header-height - $line-height) / 2);
- padding-bottom: (($header-height - $line-height) / 2 - 2);
- }
- }
+ margin-top: 0;
+ margin-bottom: 0;
}
}
// colour
@each $color in $palette-list-class {
@@ -52,48 +48,48 @@
color: nth($palette-list-text, $i);
}
}
.header-affix {
- max-height: $nav-height;
+ max-height: $header-height;
overflow: hidden;
- position: static !important;
width: 0;
&.affix {
- overflow: visible;
width: auto;
}
}
.header-affix-hide {
- position: static !important;
+ max-height: $header-height;
+ overflow: hidden;
+ width: auto;
&.affix {
- max-height: $nav-height;
- overflow: hidden;
width: 0;
}
}
.header-logo,
.header-text {
- display: block;
+ align-items: center;
+ display: flex;
float: left;
font-weight: $font-weight-light;
- height: $nav-height;
+ height: $header-height;
line-height: $line-height-h4;
margin: 0 $grid-gutter;
- padding: (($nav-height - $line-height-h4) / 2) 0;
+ white-space: nowrap;
&:focus,
&:hover {
+ outline: 0;
text-decoration: none;
}
}
.header-logo {
font-size: $font-size-h4;
img {
display: block;
- max-height: $line-height-h4;
+ max-height: ($header-height * 0.75);
width: auto;
}
}
.header-seamed,