From fc053ac8b27611e3dc7fae769ce28f154250d50e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Jan 2012 10:07:56 -0800 Subject: [PATCH] update dropdowns spacing and docs section spacing --- bootstrap.css | 11 +++-------- bootstrap.min.css | 5 ++--- docs/assets/css/docs.css | 5 ++++- lib/dropdowns.less | 14 ++++---------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 8e5ad131c1..ba51a7d455 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: 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; diff --git a/bootstrap.min.css b/bootstrap.min.css index 1723ca555e..8f2f020d1b 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -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;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 134224e567..ca1c5cb83f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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 { diff --git a/lib/dropdowns.less b/lib/dropdowns.less index daa7003e31..e2d5fef259 100644 --- a/lib/dropdowns.less +++ b/lib/dropdowns.less @@ -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; @@ -73,18 +73,12 @@ } // 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