2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
This commit is contained in:
Mark Otto
2012-11-02 09:36:51 -07:00
94 changed files with 1398 additions and 6513 deletions
+7 -15
View File
@@ -48,7 +48,7 @@
background-color: @dropdownBackground;
border: 1px solid #ccc; // IE8 fallback
border: 1px solid @dropdownBorder;
border-radius: 6px;
border-radius: @baseBorderRadius;
.box-shadow(0 5px 10px rgba(0,0,0,.2));
.background-clip(padding-box);
@@ -64,7 +64,7 @@
}
// Links within the dropdown menu
a {
li > a {
display: block;
padding: 3px 20px;
clear: both;
@@ -82,7 +82,6 @@
.dropdown-submenu:hover > a {
text-decoration: none;
color: @dropdownLinkColorHover;
background-color: @dropdownLinkBackgroundHover;
#gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
}
@@ -90,10 +89,9 @@
// ------------
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
color: @dropdownLinkColorHover;
color: @dropdownLinkColorActive;
text-decoration: none;
outline: 0;
background-color: @dropdownLinkBackgroundActive;
#gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
}
@@ -108,6 +106,7 @@
.dropdown-menu .disabled > a:hover {
text-decoration: none;
background-color: transparent;
background-image: none; // Remove CSS gradient
cursor: default;
}
@@ -157,9 +156,7 @@
left: 100%;
margin-top: -6px;
margin-left: -1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
border-radius: 0 4px 4px 4px;
}
.dropdown-submenu:hover > .dropdown-menu {
display: block;
@@ -171,9 +168,7 @@
bottom: 0;
margin-top: 0;
margin-bottom: -2px;
-webkit-border-radius: 5px 5px 5px 0;
-moz-border-radius: 5px 5px 5px 0;
border-radius: 5px 5px 5px 0;
border-radius: 4px 4px 4px 0;
}
// Caret to indicate there is a submenu
@@ -204,9 +199,7 @@
> .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
border-radius: 4px 0 4px 4px;
}
}
@@ -222,5 +215,4 @@
// ---------
.typeahead {
margin-top: 2px; // give it some space to breathe
border-radius: 4px;
}