mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-10-20 19:55:56 -07:00
parent dd34102cb6 976f6dfdad
commit 369f5ba760
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/navbar.less
+2 -1
View File
@@ -128,7 +128,6 @@
position: fixed;
right: 0;
left: 0;
border-width: 0 0 1px;
// Undo the rounded corners
@media (min-width: @grid-float-breakpoint) {
@@ -138,10 +137,12 @@
.navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0;
border-width: 0 0 1px;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0; // override .navbar defaults
border-width: 1px 0 0;
}