kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse source
This commit is contained in:
Mark Otto 2013-10-20 22:43:03 -07:00
commit 6ecb5d6cf3
5 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/css/bootstrap.css vendored
View file

@ -4266,7 +4266,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar { .navbar {
position: relative; position: relative;
z-index: 1000;
min-height: 50px; min-height: 50px;
margin-bottom: 20px; margin-bottom: 20px;
border: 1px solid transparent; border: 1px solid transparent;
@ -4399,6 +4398,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.navbar-static-top { .navbar-static-top {
z-index: 1000;
border-width: 0 0 1px; border-width: 0 0 1px;
} }
@ -4413,6 +4413,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: 1030;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@ -4424,7 +4425,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;
z-index: 1030;
border-width: 0 0 1px; border-width: 0 0 1px;
} }

2
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

7
examples/navbar/navbar.css
View file

@ -1,7 +1,8 @@
body { body {
padding: 30px; padding-top: 20px;
padding-bottom: 20px;
} }
.navbar { .navbar {
margin-bottom: 30px; margin-bottom: 20px;
} }

24
examples/theme/index.html
View file

@ -159,6 +159,18 @@
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> <li><a href="#contact">Contact</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
@ -179,6 +191,18 @@
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> <li><a href="#contact">Contact</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>

6
less/navbar.less
View file

@ -10,7 +10,6 @@
.navbar { .navbar {
position: relative; position: relative;
z-index: @zindex-navbar;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom; margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent; border: 1px solid transparent;
@ -116,7 +115,9 @@
// Static top (unfixed, but 100% wide) navbar // Static top (unfixed, but 100% wide) navbar
.navbar-static-top { .navbar-static-top {
z-index: @zindex-navbar;
border-width: 0 0 1px; border-width: 0 0 1px;
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
border-radius: 0; border-radius: 0;
} }
@ -128,6 +129,7 @@
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: @zindex-navbar-fixed;
// Undo the rounded corners // Undo the rounded corners
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
@ -135,7 +137,6 @@
} }
} }
.navbar-fixed-top { .navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0; top: 0;
border-width: 0 0 1px; border-width: 0 0 1px;
} }
@ -153,6 +154,7 @@
padding: @navbar-padding-vertical @navbar-padding-horizontal; padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-computed; line-height: @line-height-computed;
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;