aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-22 15:07:49 -0700
committerMark Otto <[email protected]>2013-06-22 15:07:49 -0700
commit42f101d746414e29f1467ebdab0b5962137f1f84 (patch)
tree7b71b28f1f9f499fbb145ea622ad39a6d90a2e5d
parentb0e943399df374b03f9ed5f676f33e42f5e53a74 (diff)
parent72183d9a452fa43ac8d994374713c7a585d1744c (diff)
downloadbootstrap-42f101d746414e29f1467ebdab0b5962137f1f84.tar.xz
bootstrap-42f101d746414e29f1467ebdab0b5962137f1f84.zip
Merge pull request #8258 from aristath/navbar-fixes
Navbar fixes
-rw-r--r--less/navbar.less8
-rw-r--r--less/variables.less1
2 files changed, 5 insertions, 4 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 6246bd62c..b8283601d 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,8 +6,8 @@
.navbar {
position: relative;
margin-bottom: 20px;
- padding-left: 15px;
- padding-right: 15px;
+ padding-left: @navbar-padding;
+ padding-right: @navbar-padding;
background-color: @navbar-bg;
border-radius: @border-radius-base;
@@ -96,7 +96,7 @@
max-width: 200px;
margin-left: auto;
margin-right: auto;
- padding: 15px;
+ padding: @navbar-padding;
font-size: @font-size-large;
font-weight: 500;
line-height: @line-height-computed;
@@ -284,7 +284,7 @@
.navbar-brand {
float: left;
- margin-left: -15px;
+ margin-left: -(@navbar-padding);
margin-right: 5px;
}
.navbar-nav {
diff --git a/less/variables.less b/less/variables.less
index f91846126..4fd0d492c 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -178,6 +178,7 @@
@navbar-height: 50px;
@navbar-color: #777;
@navbar-bg: #eee;
+@navbar-padding: floor(@grid-gutter-width / 2); // ~15px
// Navbar links
@navbar-link-color: #777;