1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

lighter default navbar, add borders to navbars, tweak padding and alignments

This commit is contained in:
Mark Otto 2013-08-13 13:39:21 -07:00
parent 48e7468e3a
commit 3c772b1ceb
4 changed files with 43 additions and 17 deletions

View file

@ -2999,7 +2999,8 @@ button.close {
position: relative; position: relative;
min-height: 50px; min-height: 50px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: #eeeeee; background-color: #f8f8f8;
border: 1px solid #e7e7e7;
} }
.navbar:before, .navbar:before,
@ -3061,11 +3062,10 @@ button.close {
.navbar-collapse { .navbar-collapse {
max-height: 360px; max-height: 360px;
padding-top: 5px; padding: 5px 15px;
padding-bottom: 5px;
overflow-x: visible; overflow-x: visible;
overflow-y: scroll; overflow-y: scroll;
border-top: 1px solid #dcdcdc; border-top: 1px solid #e6e6e6;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
@ -3101,6 +3101,7 @@ button.close {
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-static-top { .navbar-static-top {
border-width: 0 0 1px;
border-radius: 0; border-radius: 0;
} }
} }
@ -3111,6 +3112,7 @@ button.close {
right: 0; right: 0;
left: 0; left: 0;
z-index: 1030; z-index: 1030;
border-width: 0 0 1px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@ -3174,6 +3176,18 @@ button.close {
margin-top: 4px; margin-top: 4px;
} }
.navbar-nav {
margin-right: -15px;
margin-left: -15px;
}
@media (min-width: 768px) {
.navbar-nav {
margin-right: 0;
margin-left: 0;
}
}
.navbar-nav > li > a { .navbar-nav > li > a {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
@ -3191,7 +3205,7 @@ button.close {
.navbar-nav > .active > a:hover, .navbar-nav > .active > a:hover,
.navbar-nav > .active > a:focus { .navbar-nav > .active > a:focus {
color: #555555; color: #555555;
background-color: #d5d5d5; background-color: #e7e7e7;
} }
.navbar-nav > .disabled > a, .navbar-nav > .disabled > a,
@ -3233,7 +3247,7 @@ button.close {
.navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-nav .open .dropdown-menu > .active > a:focus { .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #555555; color: #555555;
background-color: #d5d5d5; background-color: #e7e7e7;
} }
.navbar-nav .open .dropdown-menu > .disabled > a, .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-nav .open .dropdown-menu > .disabled > a:hover,
@ -3248,8 +3262,8 @@ button.close {
padding: 10px 15px; padding: 10px 15px;
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
border-top: 1px solid #dcdcdc; border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #dcdcdc; border-bottom: 1px solid #e6e6e6;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@ -3311,7 +3325,7 @@ button.close {
.navbar-nav > .open > a:hover, .navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus { .navbar-nav > .open > a:focus {
color: #555555; color: #555555;
background-color: #d5d5d5; background-color: #e7e7e7;
} }
.navbar-nav > .open > a .caret, .navbar-nav > .open > a .caret,
@ -3334,6 +3348,7 @@ button.close {
.navbar-inverse { .navbar-inverse {
background-color: #222222; background-color: #222222;
border-color: #080808;
} }
.navbar-inverse .navbar-brand { .navbar-inverse .navbar-brand {
@ -3474,7 +3489,6 @@ button.close {
.navbar-text { .navbar-text {
float: left; float: left;
padding: 0 15px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }

File diff suppressed because one or more lines are too long

View file

@ -13,6 +13,7 @@
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom; margin-bottom: @navbar-margin-bottom;
background-color: @navbar-bg; background-color: @navbar-bg;
border: 1px solid @navbar-border;
// Prevent floats from breaking the navbar // Prevent floats from breaking the navbar
.clearfix(); .clearfix();
@ -50,8 +51,7 @@
// content for the user's viewport. // content for the user's viewport.
.navbar-collapse { .navbar-collapse {
padding-top: 5px; padding: 5px @navbar-padding-horizontal;
padding-bottom: 5px;
border-top: 1px solid darken(@navbar-bg, 7%); border-top: 1px solid darken(@navbar-bg, 7%);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
// Clear floated elements and prevent collapsing of padding // Clear floated elements and prevent collapsing of padding
@ -82,6 +82,7 @@
// Static top (unfixed, but 100% wide) navbar // Static top (unfixed, but 100% wide) navbar
.navbar-static-top { .navbar-static-top {
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
border-width: 0 0 1px;
border-radius: 0; border-radius: 0;
} }
} }
@ -93,6 +94,7 @@
right: 0; right: 0;
left: 0; left: 0;
z-index: @zindex-navbar-fixed; z-index: @zindex-navbar-fixed;
border-width: 0 0 1px;
// Undo the rounded corners // Undo the rounded corners
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
@ -166,6 +168,14 @@
// the nav the full height of the horizontal nav (above 768px). // the nav the full height of the horizontal nav (above 768px).
.navbar-nav { .navbar-nav {
margin-left: -@navbar-padding-horizontal;
margin-right: -@navbar-padding-horizontal;
@media (min-width: @grid-float-breakpoint) {
margin-left: 0;
margin-right: 0;
}
> li > a { > li > a {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
@ -333,6 +343,7 @@
.navbar-inverse { .navbar-inverse {
background-color: @navbar-inverse-bg; background-color: @navbar-inverse-bg;
border-color: @navbar-inverse-border;
.navbar-brand { .navbar-brand {
color: @navbar-inverse-brand-color; color: @navbar-inverse-brand-color;
@ -513,7 +524,6 @@
.navbar-text { .navbar-text {
float: left; float: left;
padding: 0 @navbar-padding-horizontal;
.navbar-vertical-align(@line-height-computed); .navbar-vertical-align(@line-height-computed);
} }

View file

@ -231,9 +231,10 @@
// Basics of a navbar // Basics of a navbar
@navbar-height: 50px; @navbar-height: 50px;
@navbar-color: #777;
@navbar-bg: #eee;
@navbar-margin-bottom: @line-height-computed; @navbar-margin-bottom: @line-height-computed;
@navbar-color: #777;
@navbar-bg: #f8f8f8;
@navbar-border: darken(@navbar-bg, 6.5%);
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@ -243,7 +244,7 @@
@navbar-link-hover-color: #333; @navbar-link-hover-color: #333;
@navbar-link-hover-bg: transparent; @navbar-link-hover-bg: transparent;
@navbar-link-active-color: #555; @navbar-link-active-color: #555;
@navbar-link-active-bg: darken(@navbar-bg, 10%); @navbar-link-active-bg: darken(@navbar-bg, 6.5%);
@navbar-link-disabled-color: #ccc; @navbar-link-disabled-color: #ccc;
@navbar-link-disabled-bg: transparent; @navbar-link-disabled-bg: transparent;
@ -263,6 +264,7 @@
// Reset inverted navbar basics // Reset inverted navbar basics
@navbar-inverse-color: @gray-light; @navbar-inverse-color: @gray-light;
@navbar-inverse-bg: #222; @navbar-inverse-bg: #222;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links // Inverted navbar links
@navbar-inverse-link-color: @gray-light; @navbar-inverse-link-color: @gray-light;