aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-10-16 19:56:34 -0700
committerMark Otto <[email protected]>2012-10-16 19:56:34 -0700
commit78f7ad95f4449506f4928e2407df91b0c0eb830a (patch)
tree4f97d6bb41d1ce9920ce9eb7bf6224e5864661a9
parentbf7833353145966f1934a2da4aa3771cb2436b48 (diff)
downloadbootstrap-78f7ad95f4449506f4928e2407df91b0c0eb830a.tar.xz
bootstrap-78f7ad95f4449506f4928e2407df91b0c0eb830a.zip
fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component.
-rw-r--r--docs/assets/css/bootstrap.css9
-rw-r--r--less/hero-unit.less11
2 files changed, 11 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ab2669562..01d119195 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5847,6 +5847,10 @@ a.badge:hover {
.hero-unit {
padding: 60px;
margin-bottom: 30px;
+ font-size: 18px;
+ font-weight: 200;
+ line-height: 30px;
+ color: inherit;
background-color: #eeeeee;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
@@ -5861,11 +5865,8 @@ a.badge:hover {
color: inherit;
}
-.hero-unit p {
- font-size: 18px;
- font-weight: 200;
+.hero-unit li {
line-height: 30px;
- color: inherit;
}
.pull-right {
diff --git a/less/hero-unit.less b/less/hero-unit.less
index 672b7d7c7..763d86aee 100644
--- a/less/hero-unit.less
+++ b/less/hero-unit.less
@@ -6,6 +6,10 @@
.hero-unit {
padding: 60px;
margin-bottom: 30px;
+ font-size: 18px;
+ font-weight: 200;
+ line-height: @baseLineHeight * 1.5;
+ color: @heroUnitLeadColor;
background-color: @heroUnitBackground;
.border-radius(6px);
h1 {
@@ -15,10 +19,7 @@
color: @heroUnitHeadingColor;
letter-spacing: -1px;
}
- p {
- font-size: 18px;
- font-weight: 200;
- line-height: @baseLineHeight * 1.5;
- color: @heroUnitLeadColor;
+ li {
+ line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less
}
}