root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity

add variables for heading font sizes; fixes #9921

This commit is contained in:
Chris Rebert 2013-08-20 17:49:17 -07:00
parent d666a89621
commit 9a4fbde461
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
less/type.less
View File

@ -72,12 +72,12 @@ h6 {
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);
} }
h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px h1, .h1 { font-size: @font-size-h1; }
h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px h2, .h2 { font-size: @font-size-h2; }
h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px h3, .h3 { font-size: @font-size-h3; }
h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px h4, .h4 { font-size: @font-size-h4; }
h5, .h5 { font-size: @font-size-base; } h5, .h5 { font-size: @font-size-h5; }
h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px h6, .h6 { font-size: @font-size-h6; }
h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px
h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px

7
less/variables.less
View File

@ -48,6 +48,13 @@
@font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-large: ceil(@font-size-base * 1.25); // ~18px
@font-size-small: ceil(@font-size-base * 0.85); // ~12px @font-size-small: ceil(@font-size-base * 0.85); // ~12px
@font-size-h1: floor(@font-size-base * 2.60); // ~36px
@font-size-h2: floor(@font-size-base * 2.15); // ~30px
@font-size-h3: ceil(@font-size-base * 1.70); // ~24px
@font-size-h4: ceil(@font-size-base * 1.25); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil(@font-size-base * 0.85); // ~12px
@line-height-base: 1.428571429; // 20/14 @line-height-base: 1.428571429; // 20/14
@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px