aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-09 00:26:32 -0700
committerMark Otto <[email protected]>2012-07-09 00:26:32 -0700
commit9887d3cf4af4897c4959491ece2fe56bef3d1114 (patch)
tree8123f54825523b98381ed3d28b16657f0b8d7411 /less
parent410decafad0496033ba965dc594786b9c4629449 (diff)
downloadbootstrap-9887d3cf4af4897c4959491ece2fe56bef3d1114.tar.xz
bootstrap-9887d3cf4af4897c4959491ece2fe56bef3d1114.zip
updating docs examples to remove 13/18 resets, fix up buttons alignments and carets
Diffstat (limited to 'less')
-rw-r--r--less/button-groups.less24
-rw-r--r--less/dropdowns.less7
2 files changed, 14 insertions, 17 deletions
diff --git a/less/button-groups.less b/less/button-groups.less
index 26cc2091a..d421b8f42 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -107,23 +107,23 @@
// Give the line between buttons some depth
.btn-group > .dropdown-toggle {
- padding-left: 8px;
- padding-right: 8px;
+ padding-left: 10px;
+ padding-right: 10px;
.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: 4px;
- *padding-bottom: 4px;
+ *padding-top: 8px;
+ *padding-bottom: 8px;
}
.btn-group > .btn-mini.dropdown-toggle {
- padding-left: 5px;
- padding-right: 5px;
+ padding-left: 8px;
+ padding-right: 8px;
}
.btn-group > .btn-small.dropdown-toggle {
- *padding-top: 4px;
- *padding-bottom: 4px;
+ *padding-top: 6px;
+ *padding-bottom: 6px;
}
.btn-group > .btn-large.dropdown-toggle {
- padding-left: 12px;
- padding-right: 12px;
+ padding-left: 14px;
+ padding-right: 14px;
}
.btn-group.open {
@@ -162,7 +162,6 @@
// Reposition the caret
.btn .caret {
- margin-top: 7px;
margin-left: 0;
}
.btn:hover .caret,
@@ -171,13 +170,10 @@
}
// Carets in other button sizes
.btn-mini .caret {
- margin-top: 5px;
}
.btn-small .caret {
- margin-top: 6px;
}
.btn-large .caret {
- margin-top: 6px;
border-left-width: 5px;
border-right-width: 5px;
border-top-width: 5px;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index e9e91b6a4..705b25d50 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -22,8 +22,8 @@
.caret {
display: inline-block;
width: 0;
- height: 0;
- vertical-align: top;
+ height: 3px;
+ vertical-align: middle;
border-top: 4px solid @black;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
@@ -33,7 +33,6 @@
// Place the caret
.dropdown .caret {
- margin-top: 8px;
margin-left: 2px;
}
.dropdown a:focus .caret,
@@ -153,6 +152,8 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
+ margin-top: -2px;
+ height: 0;
border-top: 0;
border-bottom: 4px solid @black;
content: "\2191";