Updated Bootstrap. Final touches before 1.2 release.

hiteshjoshi · Jun 16, 2012 · 31b082e · 31b082e
1 parent aa54ddf
commit 31b082e
Show file tree

Hide file tree

Showing 16 changed files with 1,627 additions and 1,268 deletions.
diff --git a/includes/bootstrap/css/bootstrap-responsive.css b/includes/bootstrap/css/bootstrap-responsive.css
@@ -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
@@ -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 {