aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-23 21:45:58 -0700
committerMark Otto <[email protected]>2013-08-23 21:45:58 -0700
commit7edd87dde901b30bb0cef9a2f72ab321c7dfb743 (patch)
tree59899e32f3e01a736587b32f0e12393003389e04 /dist/css/bootstrap.css
parentc4f1591e70bc7849a533cd7d3f81bd7960ca7448 (diff)
parentc1ddb06de78c265e4d8bad0216911b386c543633 (diff)
downloadbootstrap-7edd87dde901b30bb0cef9a2f72ab321c7dfb743.tar.xz
bootstrap-7edd87dde901b30bb0cef9a2f72ab321c7dfb743.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css29
1 files changed, 12 insertions, 17 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 3d7e7e007..5bd5e2667 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -491,6 +491,12 @@ h3 {
margin-bottom: 10px;
}
+h1 small,
+h2 small,
+h3 small {
+ font-size: 65%;
+}
+
h4,
h5,
h6 {
@@ -498,6 +504,12 @@ h6 {
margin-bottom: 10px;
}
+h4 small,
+h5 small,
+h6 small {
+ font-size: 75%;
+}
+
h1,
.h1 {
font-size: 36px;
@@ -528,23 +540,6 @@ h6,
font-size: 12px;
}
-h1 small,
-.h1 small {
- font-size: 24px;
-}
-
-h2 small,
-.h2 small {
- font-size: 18px;
-}
-
-h3 small,
-.h3 small,
-h4 small,
-.h4 small {
- font-size: 14px;
-}
-
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;