mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'bartt-master' into 2.0.3-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
This commit is contained in:
Mark Otto
2012-03-23 20:56:48 -07:00
parent f87e4c60e9 c7afe382a2
commit f9f03d8976
6 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/button-groups.less
+5 -4
View File
@@ -93,8 +93,9 @@
.btn-group .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
@shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125),
inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05));
*padding-top: 3px;
*padding-bottom: 3px;
}
@@ -119,8 +120,8 @@
// Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle {
background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
0 1px 2px rgba(0,0,0,.05));
}
// Keep the hover's background when dropdown is open