Skip to content

Commit 1a864d3

Browse files
committed
Merge pull request #2 from dstegelman/update/2.0.4
Update/2.0.4
2 parents 2187174 + 8a8369c commit 1a864d3

17 files changed

+173
-142
lines changed

bootstrap/static/bootstrap/css/bootstrap-responsive.css

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Responsive v2.0.3
2+
* Bootstrap Responsive v2.0.4
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0
@@ -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)