mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-10 22:24:19 +01:00
update dropdowns spacing and docs section spacing
This commit is contained in:
parent
b958ac77c1
commit
fc053ac8b2
11
bootstrap.css
vendored
11
bootstrap.css
vendored
@ -6,7 +6,7 @@
|
|||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
* 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 {
|
html, body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@ -1481,23 +1481,18 @@ i {
|
|||||||
}
|
}
|
||||||
.dropdown-menu a {
|
.dropdown-menu a {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 2px 15px;
|
padding: 3px 15px;
|
||||||
clear: both;
|
clear: both;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
color: #555555;
|
color: #555555;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.dropdown-menu li > a:hover {
|
.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #0088cc;
|
background-color: #0088cc;
|
||||||
}
|
}
|
||||||
.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
|
|
||||||
color: #fff;
|
|
||||||
background-color: #999;
|
|
||||||
background-image: none;
|
|
||||||
}
|
|
||||||
.dropdown.open .dropdown-toggle {
|
.dropdown.open .dropdown-toggle {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
background: #ccc;
|
background: #ccc;
|
||||||
|
5
bootstrap.min.css
vendored
5
bootstrap.min.css
vendored
@ -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 .caret{margin-top:8px;margin-left:2px;}
|
||||||
.dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
|
.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{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 a{display:block;padding:3px 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 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;background:rgba(0, 0, 0, 0.3);}
|
.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
|
||||||
.dropdown.open .dropdown-menu{display:block;}
|
.dropdown.open .dropdown-menu{display:block;}
|
||||||
.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
|
.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
|
||||||
|
@ -35,8 +35,11 @@ body > .navbar-fixed .brand:hover {
|
|||||||
|
|
||||||
/* Space out sub-sections more
|
/* Space out sub-sections more
|
||||||
-------------------------------------------------- */
|
-------------------------------------------------- */
|
||||||
|
section {
|
||||||
|
padding-top: 60px;
|
||||||
|
}
|
||||||
.page-header {
|
.page-header {
|
||||||
margin: 45px 0 18px;
|
margin: 18px 0;
|
||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
}
|
}
|
||||||
.page-header h1 {
|
.page-header h1 {
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
// Links within the dropdown menu
|
// Links within the dropdown menu
|
||||||
a {
|
a {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 2px 15px;
|
padding: 3px 15px;
|
||||||
clear: both;
|
clear: both;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
@ -73,18 +73,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hover state
|
// Hover state
|
||||||
.dropdown-menu li > a:hover {
|
.dropdown-menu li > a:hover,
|
||||||
color: #fff;
|
|
||||||
text-decoration: none;
|
|
||||||
background-color: @linkColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Active state
|
|
||||||
.dropdown-menu .active > a,
|
.dropdown-menu .active > a,
|
||||||
.dropdown-menu .active > a:hover {
|
.dropdown-menu .active > a:hover {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background-color: #999;
|
text-decoration: none;
|
||||||
background-image: none; // remove the gradient
|
background-color: @linkColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open state for the dropdown
|
// Open state for the dropdown
|
||||||
|
Loading…
Reference in New Issue
Block a user