Skip to content

B
bootstrap
Commit 42f101d7 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #8258 from aristath/navbar-fixes 

Navbar fixes
parents b0e94339 72183d9a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
less/navbar.less
View file @ 42f101d7
...@@ -6,8 +6,8 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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
View file @ 42f101d7
...@@ -178,6 +178,7 @@ ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment