]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
update dropdowns spacing and docs section spacing
authorMark Otto <markdotto@gmail.com>
Fri, 13 Jan 2012 18:07:56 +0000 (10:07 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 13 Jan 2012 18:07:56 +0000 (10:07 -0800)
bootstrap.css
bootstrap.min.css
docs/assets/css/docs.css
lib/dropdowns.less

index 8e5ad131c1ecace4f6d3b8d5cee288afdea0cb42..ba51a7d455e04af7735a01596f74a596e78b712d 100644 (file)
@@ -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: Thu Jan 12 15:28:03 PST 2012
+ * Date: Fri Jan 13 10:05:29 PST 2012
  */
 html, body {
   margin: 0;
@@ -1481,23 +1481,18 @@ i {
 }
 .dropdown-menu a {
   display: block;
-  padding: 2px 15px;
+  padding: 3px 15px;
   clear: both;
   font-weight: normal;
   line-height: 18px;
   color: #555555;
   white-space: nowrap;
 }
-.dropdown-menu li > a:hover {
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   color: #fff;
   text-decoration: none;
   background-color: #0088cc;
 }
-.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: #fff;
-  background-color: #999;
-  background-image: none;
-}
 .dropdown.open .dropdown-toggle {
   color: #ffffff;
   background: #ccc;
index 1723ca555edecdaf82c8e7c8f7cf0335f4276f4a..8f2f020d1bc49c600b7ec7c7f524f563bb2584cc 100644 (file)
@@ -302,9 +302,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .dropdown .caret{margin-top:8px;margin-left:2px;}
 .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
 .dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
-.dropdown-menu a{display:block;padding:2px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
-.dropdown-menu li>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
-.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;background-color:#999;background-image:none;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;}
 .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .dropdown.open .dropdown-menu{display:block;}
 .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
index 134224e567339a41b45b0bca922348910f114bd4..ca1c5cb83fb00bdab63e20b0457c9f9cc616d876 100644 (file)
@@ -35,8 +35,11 @@ body > .navbar-fixed .brand:hover {
 
 /* Space out sub-sections more
 -------------------------------------------------- */
+section {
+  padding-top: 60px;
+}
 .page-header {
-  margin: 45px 0 18px;
+  margin: 18px 0;
   border-bottom: 1px solid #eee;
 }
 .page-header h1 {
index daa7003e31045bc63af5eb4d3c6d6381e65e6f23..e2d5fef2597252485c1782d6369ab2c3402b50cb 100644 (file)
@@ -63,7 +63,7 @@
   // Links within the dropdown menu
   a {
     display: block;
-    padding: 2px 15px;
+    padding: 3px 15px;
     clear: both;
     font-weight: normal;
     line-height: 18px;
 }
 
 // Hover state
-.dropdown-menu li > a:hover {
-  color: #fff;
-  text-decoration: none;
-  background-color: @linkColor;
-}
-
-// Active state
+.dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: #fff;
-  background-color: #999;
-  background-image: none; // remove the gradient
+  text-decoration: none;
+  background-color: @linkColor;
 }
 
 // Open state for the dropdown