mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-21 18:54:30 +01:00
Fixes #8397: better navbar padding with grid gutter stuff
This commit is contained in:
parent
d87431a29e
commit
181b276774
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -2848,7 +2848,7 @@ button.close {
|
|||||||
.navbar-brand {
|
.navbar-brand {
|
||||||
display: block;
|
display: block;
|
||||||
max-width: 200px;
|
max-width: 200px;
|
||||||
padding: 15px;
|
padding: 15px 15px;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
.navbar {
|
.navbar {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
padding-left: @navbar-padding;
|
padding-left: @navbar-padding-horizontal;
|
||||||
padding-right: @navbar-padding;
|
padding-right: @navbar-padding-horizontal;
|
||||||
background-color: @navbar-bg;
|
background-color: @navbar-bg;
|
||||||
border-radius: @border-radius-base;
|
border-radius: @border-radius-base;
|
||||||
|
|
||||||
@ -100,7 +100,7 @@
|
|||||||
max-width: 200px;
|
max-width: 200px;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
padding: @navbar-padding;
|
padding: @navbar-padding-vertical @navbar-padding-horizontal;
|
||||||
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;
|
||||||
@ -298,7 +298,7 @@
|
|||||||
|
|
||||||
.navbar-brand {
|
.navbar-brand {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: -(@navbar-padding);
|
margin-left: -(@navbar-padding-horizontal);
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
.navbar-nav {
|
.navbar-nav {
|
||||||
|
@ -176,7 +176,8 @@
|
|||||||
@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-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px
|
||||||
|
@navbar-padding-vertical: 15px;
|
||||||
|
|
||||||
// Navbar links
|
// Navbar links
|
||||||
@navbar-link-color: #777;
|
@navbar-link-color: #777;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user