Commit ac6eff28 authored by Mark Otto's avatar Mark Otto

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

Conflicts:
	less/dropdowns.less
parents 9c2b2c58 efd5e29f
......@@ -1675,6 +1675,9 @@ table .span24 {
opacity: 1;
filter: alpha(opacity=100);
}
.btn-small .caret {
margin-top: 6px;
}
.dropdown-menu {
position: absolute;
top: 100%;
......@@ -2232,9 +2235,6 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
opacity: 0.75;
filter: alpha(opacity=75);
}
.btn-small .caret {
margin-top: 4px;
}
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 18px;
......
......@@ -143,8 +143,3 @@
}
}
// Small button dropdowns
.btn-small .caret {
margin-top: 4px;
}
......@@ -32,6 +32,7 @@
content: "\2193";
}
// Place the caret
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
......@@ -41,6 +42,11 @@
.opacity(100);
}
// Small button dropdowns
.btn-small .caret {
margin-top: 6px;
}
// The dropdown menu (ul)
// ----------------------
.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