Loosely fix responsiveness of header

This commit is contained in:
James Allen 2014-06-04 17:57:29 +01:00
parent 72939e7dd8
commit 753a7609e3
2 changed files with 13 additions and 27 deletions

View file

@ -152,10 +152,10 @@
.navbar-brand { .navbar-brand {
float: left; float: left;
padding: @navbar-padding-vertical @navbar-padding-horizontal; //padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large; //font-size: @font-size-large;
line-height: @line-height-computed; line-height: @line-height-computed;
height: @navbar-height; //height: @navbar-height;
&:hover, &:hover,
&:focus { &:focus {
@ -180,11 +180,10 @@
position: relative; position: relative;
float: right; float: right;
margin-right: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal;
padding: 9px 10px;
.navbar-vertical-align(34px); .navbar-vertical-align(34px);
background-color: transparent; background-color: transparent;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent; border: 2px solid @navbar-default-link-color;
border-radius: @border-radius-base; border-radius: @border-radius-base;
// We remove the `outline` here, but later compensate by attaching `:hover` // We remove the `outline` here, but later compensate by attaching `:hover`
@ -193,17 +192,6 @@
outline: none; outline: none;
} }
// Bars
.icon-bar {
display: block;
width: 22px;
height: 2px;
border-radius: 1px;
}
.icon-bar + .icon-bar {
margin-top: 4px;
}
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
display: none; display: none;
} }
@ -379,7 +367,6 @@
.navbar-default { .navbar-default {
background-color: @navbar-default-bg; background-color: @navbar-default-bg;
border-color: @navbar-default-border; border-color: @navbar-default-border;
height: 73px;
padding: 1rem 2rem; padding: 1rem 2rem;
.navbar-brand { .navbar-brand {
@ -399,7 +386,7 @@
> li > a { > li > a {
color: @navbar-default-link-color; color: @navbar-default-link-color;
border: 2px solid @navbar-default-link-color; border: 2px solid @navbar-default-link-color;
border-radius: 3px; border-radius: @border-radius-base;
font-size: @font-size-base * .8; font-size: @font-size-base * .8;
font-weight: 700; font-weight: 700;
line-height: 1; line-height: 1;
@ -433,12 +420,12 @@
.navbar-toggle { .navbar-toggle {
border-color: @navbar-default-toggle-border-color; border-color: @navbar-default-toggle-border-color;
color: @navbar-default-link-color;
&:hover, &:hover,
&:focus { &:focus {
background-color: @navbar-default-toggle-hover-bg; background-color: @navbar-default-toggle-hover-bg;
} border-color: @navbar-default-toggle-hover-bg;
.icon-bar { color: #fff;
background-color: @navbar-default-toggle-icon-bar-bg;
} }
} }

View file

@ -105,9 +105,9 @@
@line-height-large: 1.33; @line-height-large: 1.33;
@line-height-small: 1.5; @line-height-small: 1.5;
@border-radius-base: 4px; @border-radius-base: 3px;
@border-radius-large: 6px; @border-radius-large: 5px;
@border-radius-small: 3px; @border-radius-small: 2px;
//** Global color for active items (e.g., navs or dropdowns). //** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff; @component-active-color: #fff;
@ -362,9 +362,8 @@
@navbar-default-brand-hover-bg: transparent; @navbar-default-brand-hover-bg: transparent;
// Navbar toggle // Navbar toggle
@navbar-default-toggle-hover-bg: #ddd; @navbar-default-toggle-hover-bg: @link-hover-color;
@navbar-default-toggle-icon-bar-bg: #888; @navbar-default-toggle-border-color: @link-color;
@navbar-default-toggle-border-color: #ddd;
//== Navs //== Navs
// //