From cd2b12f788f9c1d32ae20929f7deefb5ad2d99e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Sep 2012 22:41:14 -0700 Subject: fixes #5064 manually: remove fancy quote mark --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index f8d8562b6..fe1e46d53 100644 --- a/less/forms.less +++ b/less/forms.less @@ -210,7 +210,7 @@ input[type="checkbox"]:focus { // Placeholder // ------------------------- -// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector +// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector input, textarea { .placeholder(); -- cgit v1.2.3 From bbadd429a8e4704c55ac0d9a228decf4a77f484a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 15:48:56 -0700 Subject: change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index fe1e46d53..74fb6189e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -126,7 +126,7 @@ input[type="color"], border-color: rgba(82,168,236,.8); outline: 0; outline: thin dotted \9; /* IE6-9 */ - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); } } -- cgit v1.2.3 From 537c5cc33dd91772d51c1b767eb31afbc1e9c6cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 16:18:52 -0700 Subject: use local var for a few other .box-shadow mixins to fix CSS not compiling --- less/forms.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index 74fb6189e..7030ac3c1 100644 --- a/less/forms.less +++ b/less/forms.less @@ -364,7 +364,8 @@ select:focus:required:invalid { border-color: #ee5f5b; &:focus { border-color: darken(#ee5f5b, 10%); - .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); + @shadow: 0 0 6px lighten(#ee5f5b, 20%); + .box-shadow(@shadow); } } -- cgit v1.2.3 From 6881c193ca838844cacaf343d5918fb166bdd437 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Sep 2012 16:09:36 -0700 Subject: fixes #5039: properly set .row-fluid margins for .controls-row --- less/forms.less | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index 7030ac3c1..d4e0f3487 100644 --- a/less/forms.less +++ b/less/forms.less @@ -304,8 +304,12 @@ textarea[class*="span"], .controls-row { .clearfix(); // Clear the float from controls } -.controls-row [class*="span"] { - float: left; // Float to collapse white-space for proper grid alignment + +// Float to collapse white-space for proper grid alignment +.controls-row [class*="span"], +// Redeclare the fluid grid collapse since we undo the float for inputs +.row-fluid .controls-row [class*="span"] { + float: left; } -- cgit v1.2.3 From 239e6a7d210a69413d0f4b4b000f2f38f53e1c44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Sep 2012 23:11:49 -0700 Subject: fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append --- less/forms.less | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index d4e0f3487..a48d6cb58 100644 --- a/less/forms.less +++ b/less/forms.less @@ -418,16 +418,23 @@ select:focus:required:invalid { .input-append, .input-prepend { margin-bottom: 5px; - font-size: 0; + font-size: 0; // white space collapse hack white-space: nowrap; // Prevent span and input from separating + // Reset the white space collapse hack + input, + select, + .uneditable-input, + .dropdown-menu { + font-size: @baseFontSize; + } + input, select, .uneditable-input { position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms *margin-left: 0; - font-size: @baseFontSize; vertical-align: top; .border-radius(0 @inputBorderRadius @inputBorderRadius 0); // Make input on top when focused so blue border and shadow always show -- cgit v1.2.3 From 532ee082135eec9ba510d8f085add8722da5a03b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Sep 2012 11:37:34 -0700 Subject: fixes #5150: add btn-group support to input groups --- less/forms.less | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index a48d6cb58..249e9ef84 100644 --- a/less/forms.less +++ b/less/forms.less @@ -466,6 +466,7 @@ select:focus:required:invalid { border-color: @green; } } + .input-prepend { .add-on, .btn { @@ -473,17 +474,23 @@ select:focus:required:invalid { } .add-on:first-child, .btn:first-child { + // FYI, `.btn:first-child` accounts for a button group that's prepended .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); } } + .input-append { input, select, .uneditable-input { .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); + + .btn-group .btn { + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } } .add-on, - .btn { + .btn, + .btn-group { margin-left: -1px; } .add-on:last-child, @@ -491,12 +498,16 @@ select:focus:required:invalid { .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } } + // Remove all border-radius for inputs with both prepend and append .input-prepend.input-append { input, select, .uneditable-input { .border-radius(0); + + .btn-group .btn { + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } } .add-on:first-child, .btn:first-child { @@ -508,10 +519,14 @@ select:focus:required:invalid { margin-left: -1px; .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } + .btn-group:first-child { + margin-left: 0; + } } + // SEARCH FORM // ----------- -- cgit v1.2.3 From c92a75999f8b82c1a6fc997eca1cc0206c4c3bf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Sep 2012 11:45:59 -0700 Subject: fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms --- less/forms.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index 249e9ef84..c155fc004 100644 --- a/less/forms.less +++ b/less/forms.less @@ -154,9 +154,9 @@ input[type="checkbox"] { // Set the height of select and file controls to match text inputs select, input[type="file"] { - height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ + height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; + line-height: @inputHeight; } // Make select elements obey height by applying a border @@ -223,13 +223,13 @@ textarea { // Indent the labels to position radios/checkboxes as hanging .radio, .checkbox { - min-height: 18px; // clear the floating input if there is no label text - padding-left: 18px; + min-height: @baseLineHeight; // clear the floating input if there is no label text + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } // Move the options list down to align with labels -- cgit v1.2.3 From f4d3d7da2e3ddbd751e053729935df1f3dd4c051 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Sep 2012 16:06:28 -0700 Subject: ensure 100% width for .uneditable-inputs in <767px viewports --- less/forms.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index c155fc004..c9fafec27 100644 --- a/less/forms.less +++ b/less/forms.less @@ -86,6 +86,7 @@ input[type="color"], line-height: @baseLineHeight; color: @gray; .border-radius(@inputBorderRadius); + vertical-align: middle; } // Reset appearance properties for textual inputs and textarea -- cgit v1.2.3