mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00
Code Issues Releases Wiki Activity

Merge pull request #8193 from mediafreakch/3.0.0-wip

Browse Source 
Fixes broken layout for .input-group-addons within .input-large. Follows...
This commit is contained in:
Mark Otto
2013-06-20 15:44:08 -07:00
parent 1b89a63a48 6a79f53899
commit eee719f608
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
less/forms.less
View File

@@ -227,6 +227,7 @@ input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"] { input[type="color"] {
&.input-large { &.input-large {
min-height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
border-radius: @border-radius-large; border-radius: @border-radius-large;

4
less/variables.less
View File

@@ -129,8 +129,8 @@
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2); @input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); @input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
// Dropdowns // Dropdowns