rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00
Code Issues Actions Packages Releases Activity

remove lingering rem

Browse Source
This commit is contained in:
Mark Otto 2013-03-31 13:20:54 -07:00
parent 5c601e7ac2
commit 388a4c878d
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -468,37 +468,31 @@ h6 {
h1, h1,
.h1 { .h1 {
font-size: 38.5px; font-size: 38.5px;
font-size: 4rem;
} }
h2, h2,
.h2 { .h2 {
font-size: 31.5px; font-size: 31.5px;
font-size: 3rem;
} }
h3, h3,
.h3 { .h3 {
font-size: 24.5px; font-size: 24.5px;
font-size: 2.5rem;
} }
h4, h4,
.h4 { .h4 {
font-size: 17.5px; font-size: 17.5px;
font-size: 2rem;
} }
h5, h5,
.h5 { .h5 {
font-size: 14px; font-size: 14px;
font-size: 1.6rem;
} }
h6, h6,
.h6 { .h6 {
font-size: 11.9px; font-size: 11.9px;
font-size: 1.2rem;
} }
h1 small, h1 small,

12
less/type.less
View File

@ -82,12 +82,12 @@ h6 {
margin-bottom: (@line-height-base / 2); margin-bottom: (@line-height-base / 2);
} }
h1, .h1 { font-size: (@font-size-base * 2.75); font-size: 4rem; } // ~38px h1, .h1 { font-size: (@font-size-base * 2.75); } // ~38px
h2, .h2 { font-size: (@font-size-base * 2.25); font-size: 3rem; } // ~32px h2, .h2 { font-size: (@font-size-base * 2.25); } // ~32px
h3, .h3 { font-size: (@font-size-base * 1.75); font-size: 2.5rem; } // ~24px h3, .h3 { font-size: (@font-size-base * 1.75); } // ~24px
h4, .h4 { font-size: (@font-size-base * 1.25); font-size: 2rem; } // ~18px h4, .h4 { font-size: (@font-size-base * 1.25); } // ~18px
h5, .h5 { font-size: @font-size-base; font-size: 1.6rem; } h5, .h5 { font-size: @font-size-base; }
h6, .h6 { font-size: (@font-size-base * 0.85); font-size: 1.2rem; } // ~12px h6, .h6 { font-size: (@font-size-base * 0.85); } // ~12px
h1 small, .h1 small { font-size: (@font-size-base * 1.75); } // ~24px h1 small, .h1 small { font-size: (@font-size-base * 1.75); } // ~24px
h2 small, .h2 small { font-size: (@font-size-base * 1.25); } // ~18px h2 small, .h2 small { font-size: (@font-size-base * 1.25); } // ~18px