mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-10 15:44:51 +02:00
Code Issues Releases Wiki Activity

Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip

Browse Source 
Conflicts:
	less/dropdowns.less
This commit is contained in:
Mark Otto
2012-03-05 20:49:39 -08:00
parent 9c2b2c589d efd5e29ff4
commit ac6eff280d
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/assets/css/bootstrap.css vendored
View File

@@ -1675,6 +1675,9 @@ table .span24 {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
.btn-small .caret {
margin-top: 6px;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
@@ -2232,9 +2235,6 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
opacity: 0.75; opacity: 0.75;
filter: alpha(opacity=75); filter: alpha(opacity=75);
} }
.btn-small .caret {
margin-top: 4px;
}
.alert { .alert {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: 18px; margin-bottom: 18px;

5
less/button-groups.less
View File

@@ -143,8 +143,3 @@
} }
} }
// Small button dropdowns
.btn-small .caret {
margin-top: 4px;
}

6
less/dropdowns.less
View File

@@ -32,6 +32,7 @@
content: "\2193"; content: "\2193";
} }
// Place the caret
.dropdown .caret { .dropdown .caret {
margin-top: 8px; margin-top: 8px;
margin-left: 2px; margin-left: 2px;
@@ -41,6 +42,11 @@
.opacity(100); .opacity(100);
} }
// Small button dropdowns
.btn-small .caret {
margin-top: 6px;
}
// The dropdown menu (ul) // The dropdown menu (ul)
// ---------------------- // ----------------------
.dropdown-menu { .dropdown-menu {