diff options
| author | Mark Otto <[email protected]> | 2013-10-13 20:04:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 20:04:00 -0700 |
| commit | fbc67a395f12209c177d72cca3d298b0350eaf48 (patch) | |
| tree | d7e84a7da8f47837e2848de4f0229f4646f81336 | |
| parent | be4e951b7dc254dac08a5d2c6b88be0cda6e420f (diff) | |
| parent | 36b4639b0da23574faa3373d1d50c47178db7044 (diff) | |
| download | bootstrap-fbc67a395f12209c177d72cca3d298b0350eaf48.tar.xz bootstrap-fbc67a395f12209c177d72cca3d298b0350eaf48.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | customize.html | 10 | ||||
| -rw-r--r-- | less/jumbotron.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/customize.html b/customize.html index 16e68e059..bd4b8bff5 100644 --- a/customize.html +++ b/customize.html @@ -1216,19 +1216,17 @@ base_url: "../" <h2 id="variables-jumbotron">Jumbotron</h2> <div class="row"> - <div class="col-lg-3"> + <div class="col-md-6"> <label>@jumbotron-padding</label> <input type="text" class="form-control" placeholder="30px" data-var="@jumbotron-padding"> - </div> - <div class="col-lg-3"> <label>@jumbotron-bg</label> <input type="text" class="form-control" placeholder="@gray-lighter" data-var="@jumbotron-bg"> + <label>@jumbotron-font-size</label> + <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.50)" data-var="@jumbotron-font-size"> </div> - <div class="col-lg-3"> + <div class="col-md-6"> <label>@jumbotron-color</label> <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-color"> - </div> - <div class="col-lg-3"> <label>@jumbotron-heading-color</label> <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-heading-color"> </div> 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 |