mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)

Browse Source
This commit is contained in:
Mark Otto
2013-12-18 09:49:05 -08:00
parent 0d0b5c7ddb
commit d15218a09c
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+22 -4
View File
@@ -378,31 +378,49 @@ h6 .small,
color: #999; color: #999;
} }
h1, h1,
.h1,
h2, h2,
h3 { .h2,
h3,
.h3 {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;
} }
h1 small, h1 small,
.h1 small,
h2 small, h2 small,
.h2 small,
h3 small, h3 small,
.h3 small,
h1 .small, h1 .small,
.h1 .small,
h2 .small, h2 .small,
h3 .small { .h2 .small,
h3 .small,
.h3 .small {
font-size: 65%; font-size: 65%;
} }
h4, h4,
.h4,
h5, h5,
h6 { .h5,
h6,
.h6 {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
h4 small, h4 small,
.h4 small,
h5 small, h5 small,
.h5 small,
h6 small, h6 small,
.h6 small,
h4 .small, h4 .small,
.h4 .small,
h5 .small, h5 .small,
h6 .small { .h5 .small,
h6 .small,
.h6 .small {
font-size: 75%; font-size: 75%;
} }
h1, h1,
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/type.less
+6 -6
View File
@@ -21,9 +21,9 @@ h1, h2, h3, h4, h5, h6,
} }
} }
h1, h1, .h1,
h2, h2, .h2,
h3 { h3, .h3 {
margin-top: @line-height-computed; margin-top: @line-height-computed;
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);
@@ -32,9 +32,9 @@ h3 {
font-size: 65%; font-size: 65%;
} }
} }
h4, h4, .h4,
h5, h5, .h5,
h6 { h6, .h6 {
margin-top: (@line-height-computed / 2); margin-top: (@line-height-computed / 2);
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);