Added padding variable for alerts and changed customize.html Warning state (which...

diff --git a/customize.html b/customize.html
index fcff581929d0dc307deaafedb20fa8e304115020..ea589058e4d03c18402dc5731f82ed7a41d82cae 100644 (file)
--- 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 75e142d8f18312a86989c452120426e7e9f04737..d8ec205902492ea5b53bf1f436b57dd674ac9be0 100644 (file)
--- 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 5824578744ffc5bf4be1834d79a788a67d629ce1..688901ba6ab5e5824d2660997a1b344da5a3f253 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -404,10 +404,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;