From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 18:39:39 +0000 (-0600)
Subject: remove negative margin from .brand in docs, update navbar to support buttons up thurr
X-Git-Tag: v2.0.0~6^2~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=324246e4f964437a2dfa7efbd2d1b6b039369b2c;p=thirdparty%2Fbootstrap.git

remove negative margin from .brand in docs, update navbar to support buttons up thurr
---

diff --git a/bootstrap.css b/bootstrap.css
index ff21bc836c..105c10de39 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Dec 26 17:12:29 CST 2011
+ * Date: Tue Dec 27 12:39:01 CST 2011
  */
 html, body {
   margin: 0;
@@ -1215,6 +1215,9 @@ table {
   color: #ffffff;
   background-color: transparent;
 }
+.navbar .btn {
+  margin-top: 5px;
+}
 .navbar-search {
   position: relative;
   float: left;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 711e8a37ee..048414c782 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -176,6 +176,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;}
 .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
+.navbar .btn{margin-top:5px;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;}
 .navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b3c4649419..c2c92a2519 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -22,6 +22,7 @@ body {
 body > .navbar-fixed .brand {
   padding-right: 0;
   padding-left: 0;
+  margin-left: 20px;
   float: right;
   font-weight: bold;
   color: #000;
diff --git a/lib/patterns.less b/lib/patterns.less
index 25934d80a8..d48d65e48b 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -52,6 +52,10 @@
       background-color: transparent;
     }
   }
+  // Buttons in navbar
+  .btn {
+    margin-top: 5px; // make buttons vertically centered in navbar
+  }
 }
 
 // Navbar search