diff options
| author | Mark Otto <[email protected]> | 2013-03-31 13:20:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-31 13:20:54 -0700 |
| commit | 388a4c878db2a41d15f438632463dafb65e6e748 (patch) | |
| tree | 7762a0a59fd30171d73ab33dedabf78196790df9 | |
| parent | 5c601e7ac24f916e31c7506e07f0a34b8442eba0 (diff) | |
| download | bootstrap-388a4c878db2a41d15f438632463dafb65e6e748.tar.xz bootstrap-388a4c878db2a41d15f438632463dafb65e6e748.zip | |
remove lingering rem
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/type.less | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e93ff3853..750a68a99 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -468,37 +468,31 @@ h6 { h1, .h1 { font-size: 38.5px; - font-size: 4rem; } h2, .h2 { font-size: 31.5px; - font-size: 3rem; } h3, .h3 { font-size: 24.5px; - font-size: 2.5rem; } h4, .h4 { font-size: 17.5px; - font-size: 2rem; } h5, .h5 { font-size: 14px; - font-size: 1.6rem; } h6, .h6 { font-size: 11.9px; - font-size: 1.2rem; } h1 small, diff --git a/less/type.less b/less/type.less index aac5c931a..54f18d137 100644 --- a/less/type.less +++ b/less/type.less @@ -82,12 +82,12 @@ h6 { margin-bottom: (@line-height-base / 2); } -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, .h1 { font-size: (@font-size-base * 2.75); } // ~38px +h2, .h2 { font-size: (@font-size-base * 2.25); } // ~32px +h3, .h3 { font-size: (@font-size-base * 1.75); } // ~24px +h4, .h4 { font-size: (@font-size-base * 1.25); } // ~18px +h5, .h5 { font-size: @font-size-base; } +h6, .h6 { font-size: (@font-size-base * 0.85); } // ~12px h1 small, .h1 small { font-size: (@font-size-base * 1.75); } // ~24px h2 small, .h2 small { font-size: (@font-size-base * 1.25); } // ~18px |
