diff options
| author | Mark Otto <[email protected]> | 2014-09-08 11:08:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-08 11:08:35 -0700 |
| commit | a3b8189927759fe99c7e6eac581dc53aa531eb13 (patch) | |
| tree | 0dff7c20018540cdc191970b77ec0150fbeadba6 /less | |
| parent | 994d0b20aa19d673744f303ad81c1347a26b0c96 (diff) | |
| parent | c12928abdb6c41ba5d2c81de98275c565b31f3f7 (diff) | |
| download | bootstrap-a3b8189927759fe99c7e6eac581dc53aa531eb13.tar.xz bootstrap-a3b8189927759fe99c7e6eac581dc53aa531eb13.zip | |
Merge pull request #14566 from twbs/fixes_14542
Cleaned up fix for #14511 (input border-radii variables)
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/less/forms.less b/less/forms.less index 6077ae7a3..aefc0dea5 100644 --- 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 index 48b983456..5fc82df6e 100644 --- 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; |