mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-13 13:29:25 +01:00
margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)
This commit is contained in:
parent
e56c809492
commit
a41d566d5e
6
docs/assets/css/bootstrap.css
vendored
6
docs/assets/css/bootstrap.css
vendored
@ -3387,6 +3387,7 @@ button.close {
|
||||
|
||||
.navbar-nav {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.navbar-nav > li > a {
|
||||
@ -3394,6 +3395,7 @@ button.close {
|
||||
padding-bottom: 15px;
|
||||
line-height: 20px;
|
||||
color: #777777;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.navbar-nav > li > a:hover,
|
||||
@ -3634,10 +3636,14 @@ button.close {
|
||||
.navbar .nav {
|
||||
float: left;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.navbar .nav > li {
|
||||
float: left;
|
||||
}
|
||||
.navbar .nav > li > a {
|
||||
border-radius: 0;
|
||||
}
|
||||
.navbar .nav.pull-right {
|
||||
float: right;
|
||||
}
|
||||
|
@ -22,12 +22,14 @@
|
||||
// Space out from .navbar .brand and .btn-navbar when stacked in mobile views
|
||||
// and outdent nav links so text lines up with logo.
|
||||
margin-top: 10px;
|
||||
margin-bottom: 15px;
|
||||
|
||||
> li > a {
|
||||
padding-top: ((@navbar-height - @line-height-computed) / 2);
|
||||
padding-bottom: ((@navbar-height - @line-height-computed) / 2);
|
||||
color: @navbar-link-color;
|
||||
line-height: 20px;
|
||||
border-radius: @border-radius-base;
|
||||
}
|
||||
> li > a:hover,
|
||||
> li > a:focus {
|
||||
@ -281,10 +283,15 @@
|
||||
}
|
||||
.navbar .nav {
|
||||
float: left;
|
||||
margin-top: 0; // undo top margin to make nav extend full height of navbar
|
||||
// undo margin to make nav extend full height of navbar
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
|
||||
> li {
|
||||
float: left;
|
||||
> a {
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.pull-right {
|
||||
|
Loading…
x
Reference in New Issue
Block a user