diff options
| author | Mark Otto <[email protected]> | 2013-03-14 22:25:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-14 22:25:53 -0700 |
| commit | 7e07c89b8b507102a3462dbfbea34faaf2472963 (patch) | |
| tree | b92ec689fc976efefc568f8ba10545975b4c6183 | |
| parent | ed7fe0e5ba55d71d075a23b205b227665d47fc4f (diff) | |
| parent | 8f040962057fa64357c50ac955dec71e1a204900 (diff) | |
| download | bootstrap-7e07c89b8b507102a3462dbfbea34faaf2472963.tar.xz bootstrap-7e07c89b8b507102a3462dbfbea34faaf2472963.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | less/type.less | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/less/type.less b/less/type.less index 8d177b61d..13625c949 100644 --- a/less/type.less +++ b/less/type.less @@ -52,7 +52,8 @@ a.text-success:focus { color: darken(@state-success-text, 10%); } // Headings // ------------------------- -h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { font-family: @headings-font-family; font-weight: @headings-font-weight; line-height: @line-height-base; @@ -81,17 +82,17 @@ h6 { margin-bottom: (@line-height-base / 2); } -h1 { font-size: (@font-size-base * 2.75); font-size: 4rem; } // ~38px -h2 { font-size: (@font-size-base * 2.25); font-size: 3rem; } // ~32px -h3 { font-size: (@font-size-base * 1.75); font-size: 2.5rem; } // ~24px -h4 { font-size: (@font-size-base * 1.25); font-size: 2rem; } // ~18px -h5 { font-size: @font-size-base; font-size: 1.6rem; } -h6 { font-size: (@font-size-base * 0.85); font-size: 1.2rem; } // ~12px +h1, .h1 { font-size: (@font-size-base * 2.75); font-size: 4rem; } // ~38px +h2, .h2 { font-size: (@font-size-base * 2.25); font-size: 3rem; } // ~32px +h3, .h3 { font-size: (@font-size-base * 1.75); font-size: 2.5rem; } // ~24px +h4, .h4 { font-size: (@font-size-base * 1.25); font-size: 2rem; } // ~18px +h5, .h5 { font-size: @font-size-base; font-size: 1.6rem; } +h6, .h6 { font-size: (@font-size-base * 0.85); font-size: 1.2rem; } // ~12px -h1 small { font-size: (@font-size-base * 1.75); } // ~24px -h2 small { font-size: (@font-size-base * 1.25); } // ~18px -h3 small { font-size: @font-size-base; } -h4 small { font-size: @font-size-base; } +h1 small, .h1 small { font-size: (@font-size-base * 1.75); } // ~24px +h2 small, .h2 small { font-size: (@font-size-base * 1.25); } // ~18px +h3 small, .h3 small { font-size: @font-size-base; } +h4 small, .h4 small { font-size: @font-size-base; } // Page header |