readd bootstrap.zip, add @inputBorderRadius var to close #2946

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
new file mode 100644 (file)
index 0000000..95241ab
Binary files /dev/null and b/docs/assets/bootstrap.zip differ

diff --git a/docs/download.html b/docs/download.html
index c0e3b9cf01ed21d739424b1d1619a79089741536..bb10bdf63dfaaf343805ce96449e1dbaa972fb02 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -368,6 +368,8 @@
       <input type="text" class="span3" placeholder="@white">
       <label>@inputBorder</label>
       <input type="text" class="span3" placeholder="#ccc">
+      <label>@inputBorderRadius</label>
+      <input type="text" class="span3" placeholder="3px">
       <label>@inputDisabledBackground</label>
       <input type="text" class="span3" placeholder="@grayLighter">
       <label>@formActionsBackground</label>

diff --git a/docs/less.html b/docs/less.html
index 3542858156abfa7034f9934903a05c5259c423ab..4fe26af56c01b494fa6d72e51dfa977f76e8634b 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -453,6 +453,10 @@
             <td><code>@inputBorder</code></td>
             <td><code>#ccc</code></td>
           </tr>
+          <tr>
+            <td><code>@inputBorderRadius</code></td>
+            <td><code>3px</code></td>
+          </tr>
           <tr>
             <td><code>@inputDisabledBackground</code></td>
             <td><code>@grayLighter</code></td>

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 0e73c44a44497d4e45b4972fced47c6e65253041..e9c27588b474665ee3213469ef21219e2593d3e4 100644 (file)
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -291,6 +291,8 @@
       <input type="text" class="span3" placeholder="@white">
       <label>@inputBorder</label>
       <input type="text" class="span3" placeholder="#ccc">
+      <label>@inputBorderRadius</label>
+      <input type="text" class="span3" placeholder="3px">
       <label>@inputDisabledBackground</label>
       <input type="text" class="span3" placeholder="@grayLighter">
       <label>@formActionsBackground</label>

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 5005fb1661ab7e6756df2f7ed3cae38da39524d3..5345cbf974ec3b868f97bfed104b5f98a83ac9cc 100644 (file)
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -376,6 +376,10 @@
             <td><code>@inputBorder</code></td>
             <td><code>#ccc</code></td>
           </tr>
+          <tr>
+            <td><code>@inputBorderRadius</code></td>
+            <td><code>3px</code></td>
+          </tr>
           <tr>
             <td><code>@inputDisabledBackground</code></td>
             <td><code>@grayLighter</code></td>

diff --git a/less/forms.less b/less/forms.less
index 240de5ed24b460a6ff697a9dbef0b173379c8632..d8cb54909258b0c095a095fe737711a1454c610b 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -72,7 +72,7 @@ select,
   line-height: @baseLineHeight;
   color: @gray;
   border: 1px solid @inputBorder;
-  .border-radius(3px);
+  .border-radius(@inputBorderRadius);
 }
 .uneditable-textarea {
   width: auto;
@@ -372,7 +372,7 @@ select:focus:required:invalid {
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     vertical-align: middle;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
       z-index: 2;
@@ -397,7 +397,7 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .active {
     background-color: lighten(@green, 30);
@@ -414,7 +414,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .uneditable-input {
     border-left-color: #eee;
@@ -423,7 +423,7 @@ select:focus:required:invalid {
   .add-on,
   .btn {
     margin-left: -1px;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
   }
 }
 // Remove all border-radius for inputs with both prepend and append
@@ -436,12 +436,12 @@ select:focus:required:invalid {
   .add-on:first-child,
   .btn:first-child {
     margin-right: -1px;
-    .border-radius(3px 0 0 3px);
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .add-on:last-child,
   .btn:last-child {
     margin-left: -1px;
-    .border-radius(0 3px 3px 0);
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
   }
 }
 

diff --git a/less/variables.less b/less/variables.less
index 30dd73b8b8b93696518ae712b9a460e1d5800a44..a9e3d4082c66dd4d6cf5acdef24956019260b530 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -96,6 +96,7 @@
 // -------------------------
 @inputBackground:               @white;
 @inputBorder:                   #ccc;
+@inputBorderRadius:             3px;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         #f5f5f5;