0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

change h4 back to lineheight * 2

This commit is contained in:
Mark Otto 2011-09-29 01:44:51 -07:00
parent 4e9849966d
commit 00204a80cf
3 changed files with 10 additions and 11 deletions

8
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Sep 29 01:42:34 PDT 2011
* Date: Thu Sep 29 01:44:42 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@ -441,20 +441,20 @@ h3 {
h3 small {
font-size: 14px;
}
h4, h5, h6 {
line-height: 18px;
}
h4 {
font-size: 16px;
line-height: 36px;
}
h4 small {
font-size: 12px;
}
h5 {
font-size: 14px;
line-height: 18px;
}
h6 {
font-size: 13px;
line-height: 18px;
color: #777777;
text-transform: uppercase;
}

7
bootstrap.min.css vendored
View File

@ -81,10 +81,9 @@ h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;}h1 small,h2 small,h3 small,h4
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
h3{line-height:36px;font-size:18px;}h3 small{font-size:14px;}
h4,h5,h6{line-height:18px;}
h4{font-size:16px;}h4 small{font-size:12px;}
h5{font-size:14px;}
h6{font-size:13px;color:#777777;text-transform:uppercase;}
h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;}
h5{font-size:14px;line-height:18px;}
h6{font-size:13px;line-height:18px;color:#777777;text-transform:uppercase;}
ul,ol{margin:0 0 18px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;}

View File

@ -48,20 +48,20 @@ h3 {
font-size: 14px;
}
}
h4, h5, h6 {
line-height: @baseline;
}
h4 {
font-size: 16px;
line-height: @baseline * 2;
small {
font-size: 12px;
}
}
h5 {
font-size: 14px;
line-height: @baseline;
}
h6 {
font-size: 13px;
line-height: @baseline;
color: @grayLight;
text-transform: uppercase;
}