mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge pull request #8258 from aristath/navbar-fixes

Browse Source 
Navbar fixes
This commit is contained in:
Mark Otto
2013-06-22 15:07:49 -07:00
parent b0e943399d 72183d9a45
commit 42f101d746
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/navbar.less
+4 -4
View File
@@ -6,8 +6,8 @@
.navbar { .navbar {
position: relative; position: relative;
margin-bottom: 20px; margin-bottom: 20px;
padding-left: 15px; padding-left: @navbar-padding;
padding-right: 15px; padding-right: @navbar-padding;
background-color: @navbar-bg; background-color: @navbar-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
@@ -96,7 +96,7 @@
max-width: 200px; max-width: 200px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding: 15px; padding: @navbar-padding;
font-size: @font-size-large; font-size: @font-size-large;
font-weight: 500; font-weight: 500;
line-height: @line-height-computed; line-height: @line-height-computed;
@@ -284,7 +284,7 @@
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-left: -15px; margin-left: -(@navbar-padding);
margin-right: 5px; margin-right: 5px;
} }
.navbar-nav { .navbar-nav {
less/variables.less
+1
View File
@@ -178,6 +178,7 @@
@navbar-height: 50px; @navbar-height: 50px;
@navbar-color: #777; @navbar-color: #777;
@navbar-bg: #eee; @navbar-bg: #eee;
@navbar-padding: floor(@grid-gutter-width / 2); // ~15px
// Navbar links // Navbar links
@navbar-link-color: #777; @navbar-link-color: #777;