aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-13 20:03:02 -0700
committerMark Otto <[email protected]>2013-10-13 20:03:02 -0700
commit36b4639b0da23574faa3373d1d50c47178db7044 (patch)
tree82429125e38406674039e315660bada6cf00e35f /less
parent44b32a30366440b2127b343fbd1990fe15e88185 (diff)
parent0740d01b4ccbce54b9e852df63bdf891b532baa2 (diff)
downloadbootstrap-36b4639b0da23574faa3373d1d50c47178db7044.tar.xz
bootstrap-36b4639b0da23574faa3373d1d50c47178db7044.zip
Merge pull request #10949 from StevenBlack/jumbotron.fontsize
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
Diffstat (limited to 'less')
-rw-r--r--less/jumbotron.less2
-rw-r--r--less/variables.less2
2 files changed, 2 insertions, 2 deletions
diff --git a/less/jumbotron.less b/less/jumbotron.less
index 3a2365f05..22c29780a 100644
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -6,7 +6,7 @@
.jumbotron {
padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding;
- font-size: (@font-size-base * 1.5);
+ font-size: @jumbotron-font-size;
font-weight: 200;
line-height: (@line-height-base * 1.5);
color: @jumbotron-color;
diff --git a/less/variables.less b/less/variables.less
index 1a998b946..aede11bac 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -368,8 +368,8 @@
@jumbotron-padding: 30px;
@jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter;
-
@jumbotron-heading-color: inherit;
+@jumbotron-font-size: ceil(@font-size-base * 1.50);
// Form states and alerts