Skip to content

Commit

Permalink
Merge pull request bittner#1 from dstegelman/update/2.0.3
Browse files Browse the repository at this point in the history
bootstrap 2.0.3
  • Loading branch information
dstegelman committed Aug 26, 2012
2 parents 67210ed + b7e7fe3 commit 2187174
Show file tree
Hide file tree
Showing 31 changed files with 143 additions and 174 deletions.
13 changes: 3 additions & 10 deletions bootstrap/static/bootstrap/css/bootstrap-responsive.css 100644 → 100755
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.0.4
* Bootstrap Responsive v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down Expand Up @@ -683,18 +683,11 @@
body {
padding-top: 0;
}
.navbar-fixed-top,
.navbar-fixed-bottom {
position: static;
}
.navbar-fixed-top {
position: static;
margin-bottom: 18px;
}
.navbar-fixed-bottom {
margin-top: 18px;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
.navbar-fixed-top .navbar-inner {
padding: 5px;
}
.navbar .container {
Expand Down

0 comments on commit 2187174

Please sign in to comment.