]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Update forms vars
authorMark Otto <otto@github.com>
Wed, 24 Jul 2013 06:25:46 +0000 (23:25 -0700)
committerMark Otto <otto@github.com>
Wed, 24 Jul 2013 06:25:46 +0000 (23:25 -0700)
* Reorganize layout
* Add input group var
* Add legend border var

customize.html
less/forms.less
less/variables.less

index 0fc753ca70b50ab3c6d691564deea3c8cd17b979..0bb8f12b8a6732fcbaea389b18bbc76703aeab7f 100644 (file)
@@ -780,27 +780,35 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-forms">Forms</h2>
       <div class="row">
         <div class="col-lg-6">
-          <h3>Background</h3>
+          <h3>Inputs</h3>
           <label>@input-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block"><code>&lt;input&gt;</code> background color</p>
+          <label>@input-border</label>
+          <input type="text" placeholder="#ccc">
+          <p class="help-block"><code>&lt;input&gt;</code> border color</p>
+          <label>@input-border-radius</label>
+          <input type="text" placeholder="@border-radius-base">
+          <p class="help-block"><code>&lt;input&gt;</code> border radius</p>
           <label>@input-bg-disabled</label>
           <input type="text" placeholder="@gray-lighter">
-          <p class="help-block"><code>&lt;input disabled&gt;</code>background color</p>
-
+          <p class="help-block"><code>&lt;input disabled&gt;</code> background color</p>
+        </div>
+        <div class="col-lg-6">
           <h3>Placeholder</h3>
           <label>@input-color-placeholder</label>
           <input type="text" placeholder="@gray-light">
           <p class="help-block">Placeholder text color</p>
-        </div>
-        <div class="col-lg-6">
-          <h3>Border</h3>
-          <label>@input-border</label>
-          <input type="text" placeholder="#ccc">
-          <p class="help-block"><code>&lt;input&gt;</code> border color</p>
-          <label>@input-border-radius</label>
-          <input type="text" placeholder="@border-radius-base">
-          <p class="help-block"><code>&lt;input&gt;</code>border radius</p>
+
+          <h3>Legend</h3>
+          <label>@legend-border-color</label>
+          <input type="text" placeholder="#e5e5e5">
+          <p class="help-block"><code>&lt;legend&gt;</code> border color</p>
+
+          <h3>Input groups</h3>
+          <label>@input-group-addon-border-color</label>
+          <input type="text" placeholder="@input-border">
+          <p class="help-block">Border color for textual input addons</p>
         </div>
       </div>
 
index e2cb66d7c454e017676446fa7b3750c3e4343b4f..5991df9db03b2a5f215ccdccc6b7a713772993c1 100644 (file)
@@ -344,7 +344,6 @@ select {
   font-weight: normal;
   line-height: @line-height-base;
   text-align: center;
-  text-shadow: @input-group-addon-text-shadow;
   background-color: @gray-lighter;
   border: 1px solid @input-group-addon-border-color;
   border-radius: @border-radius-base;
index 38ca8a474831690df2a9cce471a14c049b31203a..7e1de3bdf0a6deb8b152eb50b1ce7a3f11935136 100644 (file)
 
 @legend-border-color:            #e5e5e5;
 
-@input-group-addon-text-shadow:  0 1px 0 #fff;
-@input-group-addon-border-color: #ccc;
+@input-group-addon-border-color: @input-border;
 
 
 // Dropdowns