aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
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 /docs/assets/css
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 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css37
-rw-r--r--docs/assets/css/docs.css8
2 files changed, 14 insertions, 31 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5af92fad1..678559c5a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2498,8 +2498,8 @@ table .span24 {
.caret {
display: inline-block;
width: 0;
- height: 0;
- vertical-align: top;
+ height: 3px;
+ vertical-align: middle;
border-top: 4px solid #000000;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
@@ -2509,7 +2509,6 @@ table .span24 {
}
.dropdown .caret {
- margin-top: 8px;
margin-left: 2px;
}
@@ -2617,6 +2616,8 @@ table .span24 {
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
+ height: 0;
+ margin-top: -2px;
border-top: 0;
border-bottom: 4px solid #000000;
content: "\2191";
@@ -3187,28 +3188,28 @@ input[type="submit"].btn.btn-mini {
}
.btn-group > .dropdown-toggle {
- *padding-top: 4px;
- padding-right: 8px;
- *padding-bottom: 4px;
- padding-left: 8px;
+ *padding-top: 8px;
+ padding-right: 10px;
+ *padding-bottom: 8px;
+ padding-left: 10px;
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn-group > .btn-mini.dropdown-toggle {
- padding-right: 5px;
- padding-left: 5px;
+ padding-right: 8px;
+ padding-left: 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-right: 12px;
- padding-left: 12px;
+ padding-right: 14px;
+ padding-left: 14px;
}
.btn-group.open .dropdown-toggle {
@@ -3247,7 +3248,6 @@ input[type="submit"].btn.btn-mini {
}
.btn .caret {
- margin-top: 7px;
margin-left: 0;
}
@@ -3257,16 +3257,7 @@ input[type="submit"].btn.btn-mini {
filter: alpha(opacity=100);
}
-.btn-mini .caret {
- margin-top: 5px;
-}
-
-.btn-small .caret {
- margin-top: 6px;
-}
-
.btn-large .caret {
- margin-top: 6px;
border-top-width: 5px;
border-right-width: 5px;
border-left-width: 5px;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e2b6aeba1..9593ae772 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -544,14 +544,6 @@ h2 + .row {
/* Tweak examples
------------------------- */
-.bs-docs-example,
-.bs-docs-example > p {
- font-size: 13px;
- line-height: 18px;
-}
-.bs-docs-example > p {
- margin-bottom: 9px;
-}
.bs-docs-example > p:last-child {
margin-bottom: 0;
}