Skip to content

Commit 5657ab4

Browse files
committed
Merge branch '2.0.4-wip'
2 parents a85c8fe + 4eaeea8 commit 5657ab4

39 files changed

+1899
-1460
lines changed

docs/assets/css/bootstrap-responsive.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,11 +683,18 @@
683683
body {
684684
padding-top: 0;
685685
}
686-
.navbar-fixed-top {
686+
.navbar-fixed-top,
687+
.navbar-fixed-bottom {
687688
position: static;
689+
}
690+
.navbar-fixed-top {
688691
margin-bottom: 18px;
689692
}
690-
.navbar-fixed-top .navbar-inner {
693+
.navbar-fixed-bottom {
694+
margin-top: 18px;
695+
}
696+
.navbar-fixed-top .navbar-inner,
697+
.navbar-fixed-bottom .navbar-inner {
691698
padding: 5px;
692699
}
693700
.navbar .container {

0 commit comments

Comments
 (0)