Skip to content

B
bootstrap
Commit ac6eff28 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	less/dropdowns.less
parents 9c2b2c58 efd5e29f
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
docs/assets/css/bootstrap.css
View file @ ac6eff28
...@@ -1675,6 +1675,9 @@ table .span24 { ...@@ -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 { ...@@ -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;
......
less/button-groups.less
View file @ ac6eff28
...@@ -143,8 +143,3 @@ ...@@ -143,8 +143,3 @@
} }
} }
// Small button dropdowns
.btn-small .caret {
margin-top: 4px;
}
less/dropdowns.less
View file @ ac6eff28
...@@ -32,6 +32,7 @@ ...@@ -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 @@ ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment