Merge pull request twbs#14566 from twbs/fixes_14542

Cleaned up fix for twbs#14511 (input border-radii variables)
Hearooo · Sep 8, 2014 · a3b8189 · a3b8189
2 parents 994d0b2 + c12928a
commit a3b8189
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/less/forms.less b/less/forms.less
@@ -325,12 +325,12 @@ input[type="checkbox"] {
 
 .input-sm,
 .form-group-sm .form-control {
-  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
 }
 
 .input-lg,
 .form-group-lg .form-control {
-  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
+  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
 }
 
 

diff --git a/less/variables.less b/less/variables.less
@@ -182,8 +182,15 @@
 @input-color:                    @gray;
 //** `<input>` border color
 @input-border:                   #ccc;
-//** `<input>` border radius
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
 @input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
 //** Border color for inputs on focus
 @input-border-focus:             #66afe9;