diff options
| author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/hero-unit.less | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'less/hero-unit.less')
| -rw-r--r-- | less/hero-unit.less | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/less/hero-unit.less b/less/hero-unit.less index 672b7d7c74..763d86aeee 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 } } |