diff options
| author | Mark Otto <[email protected]> | 2013-07-18 01:04:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-18 01:04:54 -0700 |
| commit | 181b27677492050adceaa52fe972115515759f07 (patch) | |
| tree | 08c557e802e71cf7648901c93213b0f60c8d4c5a | |
| parent | d87431a29e6ca3e58df50209ba5f6d487cd1c780 (diff) | |
| download | bootstrap-181b27677492050adceaa52fe972115515759f07.tar.xz bootstrap-181b27677492050adceaa52fe972115515759f07.zip | |
Fixes #8397: better navbar padding with grid gutter stuff
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/navbar.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8c895e995..3c74388b6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2848,7 +2848,7 @@ button.close { .navbar-brand { display: block; max-width: 200px; - padding: 15px; + padding: 15px 15px; margin-right: auto; margin-left: auto; font-size: 18px; diff --git a/less/navbar.less b/less/navbar.less index 7a6e80488..181849057 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -6,8 +6,8 @@ .navbar { position: relative; margin-bottom: 20px; - padding-left: @navbar-padding; - padding-right: @navbar-padding; + padding-left: @navbar-padding-horizontal; + padding-right: @navbar-padding-horizontal; background-color: @navbar-bg; border-radius: @border-radius-base; @@ -100,7 +100,7 @@ max-width: 200px; margin-left: auto; margin-right: auto; - padding: @navbar-padding; + padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; font-weight: 500; line-height: @line-height-computed; @@ -298,7 +298,7 @@ .navbar-brand { float: left; - margin-left: -(@navbar-padding); + margin-left: -(@navbar-padding-horizontal); margin-right: 5px; } .navbar-nav { diff --git a/less/variables.less b/less/variables.less index daeccb4b7..b28d33091 100644 --- a/less/variables.less +++ b/less/variables.less @@ -176,7 +176,8 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; -@navbar-padding: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-vertical: 15px; // Navbar links @navbar-link-color: #777; |