]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
cleanup subnav example
authorMark Otto <markotto@twitter.com>
Fri, 13 Jul 2012 17:58:20 +0000 (10:58 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 13 Jul 2012 17:58:20 +0000 (10:58 -0700)
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/navbar.less

index aae62efc64aa667c21402536a7e5c0f66951a78f..30de241fec7dbd2a23afd7be7f877699c2e79a71 100644 (file)
@@ -3950,6 +3950,7 @@ input[type="submit"].btn.btn-mini {
 
 .navbar-search .search-query {
   padding: 4px 9px;
+  margin-bottom: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
@@ -4237,12 +4238,14 @@ input[type="submit"].btn.btn-mini {
 -------------------------------------------------- */
 
 .navbar-subnav .navbar-inner {
+  padding-right: 10px;
+  padding-left: 10px;
   background-color: #f9f9f9;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1));
   background-image: -webkit-linear-gradient(top, #ffffff, #f1f1f1);
-  background-image: -o-linear-gradient(top, #ffffff, #f1f1f1);
   background-image: linear-gradient(to bottom, #ffffff, #f1f1f1);
   background-image: -moz-linear-gradient(top, #ffffff, #f1f1f1);
+  background-image: -o-linear-gradient(top, #ffffff, #f1f1f1);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f1f1f1));
   background-repeat: repeat-x;
   border: 1px solid #e5e5e5;
   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff1f1f1', GradientType=0);
index a48037a2d6c8589ec2f8adcacf565a4e5b21ba30..19f33028cf0dc63a703c79d38722f8642348faf2 100644 (file)
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="#">Title</a>
                 <div class="nav-collapse subnav-collapse">
                   <ul class="nav">
                     <li class="active"><a href="#">Home</a></li>
index c2005dbc620a576c10841afce7b327cf79207f49..5c2c40847adcd6dd29c3f2a3b193e9f5c3acfc02 100644 (file)
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="#">{{_i}}Title{{/i}}</a>
                 <div class="nav-collapse subnav-collapse">
                   <ul class="nav">
                     <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
index 54c5079bd44b78ca5cfab9e8ee15c70238e71051..8cb4274110d1f17f2093327ec653be1e9b5354af 100644 (file)
   .navbarVerticalAlign(28px); // Vertically center in navbar
   margin-bottom: 0;
   .search-query {
+    margin-bottom: 0;
     padding: 4px 9px;
     #font > .sans-serif(13px, normal, 1);
     color: @white;
   #gradient > .vertical(#ffffff, #f1f1f1);
   .box-shadow(none);
   border: 1px solid #e5e5e5;
+  padding-left: 10px;
+  padding-right: 10px;
 }
 
 // Lighten vertical dividers