diff options
| author | Mark Otto <[email protected]> | 2013-08-05 15:40:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 15:40:22 -0700 |
| commit | 9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd (patch) | |
| tree | 0881f3d44092ff0dc31047b2de1fd5b2dffa224a | |
| parent | 844df9e0011c0dff5900bcbed3f1146564c0103c (diff) | |
| parent | 9123163b8ff05d84f1f4bada5a3466216cff8ea1 (diff) | |
| download | bootstrap-9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd.tar.xz bootstrap-9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd.zip | |
Merge pull request #9121 from Flydiverny/alerts
Added padding variable for alerts and changed customize.html
| -rw-r--r-- | customize.html | 18 | ||||
| -rw-r--r-- | less/alerts.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/customize.html b/customize.html index fcff58192..866ce83f5 100644 --- a/customize.html +++ b/customize.html @@ -660,12 +660,21 @@ base_url: "../" </div> <h2 id="variables-alerts">Alerts</h2> - <p>Define alert colors and border radius.</p> + <p>Define alert colors, border radius, and padding.</p> <h4>Border radius</h4> + <label>@alert-padding</label> + <input type="text" class="form-control" placeholder="15px"> <label>@alert-border-radius</label> <input type="text" class="form-control" placeholder="@border-radius-base"> <div class="row"> <div class="col-lg-6"> + <h4>Default (Warning)</h4> + <label>@alert-text</label> + <input type="text" class="form-control" placeholder="@state-warning-text"> + <label>@alert-bg</label> + <input type="text" class="form-control" placeholder="@state-warning-bg"> + <label>@alert-border</label> + <input type="text" class="form-control" placeholder="@state-warning-border"> <h4>Success</h4> <label>@alert-success-text</label> <input type="text" class="form-control" placeholder="@state-success-text"> @@ -673,13 +682,6 @@ base_url: "../" <input type="text" class="form-control" placeholder="@state-success-bg"> <label>@alert-success-border</label> <input type="text" class="form-control" placeholder="@state-success-border"> - <h4>Warning</h4> - <label>@alert-warning-text</label> - <input type="text" class="form-control" placeholder="@state-warning-text"> - <label>@alert-warning-bg</label> - <input type="text" class="form-control" placeholder="@state-warning-bg"> - <label>@alert-warning-border</label> - <input type="text" class="form-control" placeholder="@state-warning-border"> </div> <div class="col-lg-6"> <h4>Danger</h4> diff --git a/less/alerts.less b/less/alerts.less index 75e142d8f..d8ec20590 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -7,7 +7,7 @@ // ------------------------- .alert { - padding: 15px 35px 15px 15px; + padding: @alert-padding (@alert-padding + 20) @alert-padding @alert-padding; margin-bottom: @line-height-computed; color: @alert-text; background-color: @alert-bg; diff --git a/less/variables.less b/less/variables.less index 48c6d88b2..66f32c9eb 100644 --- a/less/variables.less +++ b/less/variables.less @@ -402,10 +402,12 @@ // Alerts // ------------------------- +@alert-padding: 15px; +@alert-border-radius: @border-radius-base; + @alert-bg: @state-warning-bg; @alert-text: @state-warning-text; @alert-border: @state-warning-border; -@alert-border-radius: @border-radius-base; @alert-success-bg: @state-success-bg; @alert-success-text: @state-success-text; |