rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)

Browse Source
This commit is contained in:
Mark Otto 2013-05-14 22:08:56 -07:00
parent e56c809492
commit a41d566d5e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -3387,6 +3387,7 @@ button.close {
.navbar-nav { .navbar-nav {
margin-top: 10px; margin-top: 10px;
margin-bottom: 15px;
} }
.navbar-nav > li > a { .navbar-nav > li > a {
@ -3394,6 +3395,7 @@ button.close {
padding-bottom: 15px; padding-bottom: 15px;
line-height: 20px; line-height: 20px;
color: #777777; color: #777777;
border-radius: 4px;
} }
.navbar-nav > li > a:hover, .navbar-nav > li > a:hover,
@ -3634,10 +3636,14 @@ button.close {
.navbar .nav { .navbar .nav {
float: left; float: left;
margin-top: 0; margin-top: 0;
margin-bottom: 0;
} }
.navbar .nav > li { .navbar .nav > li {
float: left; float: left;
} }
.navbar .nav > li > a {
border-radius: 0;
}
.navbar .nav.pull-right { .navbar .nav.pull-right {
float: right; float: right;
} }

9
less/navbar.less
View File

@ -22,12 +22,14 @@
// Space out from .navbar .brand and .btn-navbar when stacked in mobile views // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
// and outdent nav links so text lines up with logo. // and outdent nav links so text lines up with logo.
margin-top: 10px; margin-top: 10px;
margin-bottom: 15px;
> li > a { > li > a {
padding-top: ((@navbar-height - @line-height-computed) / 2); padding-top: ((@navbar-height - @line-height-computed) / 2);
padding-bottom: ((@navbar-height - @line-height-computed) / 2); padding-bottom: ((@navbar-height - @line-height-computed) / 2);
color: @navbar-link-color; color: @navbar-link-color;
line-height: 20px; line-height: 20px;
border-radius: @border-radius-base;
} }
> li > a:hover, > li > a:hover,
> li > a:focus { > li > a:focus {
@ -281,10 +283,15 @@
} }
.navbar .nav { .navbar .nav {
float: left; 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 { > li {
float: left; float: left;
> a {
border-radius: 0;
}
} }
&.pull-right { &.pull-right {