rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #10949 from StevenBlack/jumbotron.fontsize

Browse Source 
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
This commit is contained in:
Mark Otto 2013-10-13 20:03:02 -07:00
commit 36b4639b0d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
customize.html
View File

@ -1216,19 +1216,17 @@ base_url: "../"
<h2 id="variables-jumbotron">Jumbotron</h2> <h2 id="variables-jumbotron">Jumbotron</h2>
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-md-6">
<label>@jumbotron-padding</label> <label>@jumbotron-padding</label>
<input type="text" class="form-control" placeholder="30px" data-var="@jumbotron-padding"> <input type="text" class="form-control" placeholder="30px" data-var="@jumbotron-padding">
</div>
<div class="col-lg-3">
<label>@jumbotron-bg</label> <label>@jumbotron-bg</label>
<input type="text" class="form-control" placeholder="@gray-lighter" data-var="@jumbotron-bg"> <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>
<div class="col-lg-3"> <div class="col-md-6">
<label>@jumbotron-color</label> <label>@jumbotron-color</label>
<input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-color"> <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-color">
</div>
<div class="col-lg-3">
<label>@jumbotron-heading-color</label> <label>@jumbotron-heading-color</label>
<input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-heading-color"> <input type="text" class="form-control" placeholder="inherit" data-var="@jumbotron-heading-color">
</div> </div>

2
less/jumbotron.less
View File

@ -6,7 +6,7 @@
.jumbotron { .jumbotron {
padding: @jumbotron-padding; padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding; margin-bottom: @jumbotron-padding;
font-size: (@font-size-base * 1.5); font-size: @jumbotron-font-size;
font-weight: 200; font-weight: 200;
line-height: (@line-height-base * 1.5); line-height: (@line-height-base * 1.5);
color: @jumbotron-color; color: @jumbotron-color;

2
less/variables.less
View File

@ -368,8 +368,8 @@
@jumbotron-padding: 30px; @jumbotron-padding: 30px;
@jumbotron-color: inherit; @jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter; @jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit; @jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil(@font-size-base * 1.50);
// Form states and alerts // Form states and alerts