Skip to content

Commit

Permalink
Twitter Bootstrap 2.0.3 -> 2.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
coto committed Jun 3, 2012
1 parent b2e0fbc commit cd3a0e4
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 114 deletions.
2 changes: 1 addition & 1 deletion README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ http:https://appengine.protoboard.cl
== Front-end Technologies
* {HTML5Boilerplate}[http:https://html5boilerplate.com/] with {Modernizr 2.5.3}[http:https://modernizr.com]
* jQuery 1.7.2
* {Twitter Bootstrap 2.0.3}[http:https://twitter.github.com/bootstrap/] Template for Desktop Version.
* {Twitter Bootstrap 2.0.4}[http:https://twitter.github.com/bootstrap/] Template for Desktop Version.



Expand Down
13 changes: 10 additions & 3 deletions static/css/bootstrap-responsive.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.0.3
* Bootstrap Responsive v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down Expand Up @@ -683,11 +683,18 @@
body {
padding-top: 0;
}
.navbar-fixed-top {
.navbar-fixed-top,
.navbar-fixed-bottom {
position: static;
}
.navbar-fixed-top {
margin-bottom: 18px;
}
.navbar-fixed-top .navbar-inner {
.navbar-fixed-bottom {
margin-top: 18px;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
Expand Down
4 changes: 2 additions & 2 deletions static/css/bootstrap-responsive.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit cd3a0e4

Please sign in to comment.