From e9413315b55ec036a6de9846e4fb2fed1f910b7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Jul 2013 18:06:20 -0700 Subject: fixes #8937: align the dropdown menus in input groups --- less/input-groups.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index fed7d5645..f717e59c0 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -5,6 +5,7 @@ // Base styles // ------------------------- .input-group { + position: relative; // For dropdowns display: table; border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table -- cgit v1.2.3 From a5641b0cca0d179d063bbf13fc3b7702605b091b Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Thu, 1 Aug 2013 16:05:07 +0200 Subject: Update input-groups.less align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2) --- less/input-groups.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index f717e59c0..3586beef7 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -136,7 +136,9 @@ // -------------------------------------------------- // Horizontal forms are built on grid classes. -.form-horizontal .control-label { +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { padding-top: 9px; } -- cgit v1.2.3 From 9435991ff0ffa79c027f12c0a08aa13376c3b2fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 18:48:44 -0700 Subject: move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b) --- less/input-groups.less | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 3586beef7..1a6368831 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -113,44 +113,3 @@ z-index: 2; } } - - -// Inline forms -// -------------------------------------------------- - -.form-inline { - .form-control, - .radio, - .checkbox { - display: inline-block; - } - .radio, - .checkbox { - margin-top: 0; - margin-bottom: 0; - } -} - - -// Horizontal forms -// -------------------------------------------------- -// Horizontal forms are built on grid classes. - -.form-horizontal .control-label, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: 9px; -} - -.form-horizontal { - .form-group { - .make-row(); - } -} - -// Only right align form labels here when the columns stop stacking -@media (min-width: @screen-tablet) { - .form-horizontal .control-label { - text-align: right; - } -} -- cgit v1.2.3 From 4bbbf774a4b36ce5f36e4a35a2e7bed807dd640b Mon Sep 17 00:00:00 2001 From: liuyl Date: Sun, 4 Aug 2013 09:27:23 +0800 Subject: add line-height --- less/input-groups.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 1a6368831..77be68d92 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -59,11 +59,13 @@ padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; + line-height: @line-height-small; } &.input-large { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; + line-height: @line-height-large; } // Nuke default margins from checkboxes and radios to vertically center within. -- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- less/input-groups.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 77be68d92..79d1afcd4 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -55,13 +55,13 @@ border-radius: @border-radius-base; // Sizing - &.input-small { + &.input-sm { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; line-height: @line-height-small; } - &.input-large { + &.input-lg { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; -- cgit v1.2.3 From 7bc817bcbaa26bca46dcbd2e8a1c299d1f7c4097 Mon Sep 17 00:00:00 2001 From: geedmo Date: Mon, 5 Aug 2013 19:43:39 -0300 Subject: Fix Issue #8175 --- less/input-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 79d1afcd4..21b07922b 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -48,7 +48,7 @@ padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; - line-height: @line-height-base; + line-height: 1; text-align: center; background-color: @gray-lighter; border: 1px solid @input-group-addon-border-color; -- cgit v1.2.3 From c2737771b4e9b63655081c91878c6e66d9c3105a Mon Sep 17 00:00:00 2001 From: geedmo Date: Mon, 5 Aug 2013 19:58:38 -0300 Subject: Fix Issue #8175 - remove lh for input-lg|sm --- less/input-groups.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 21b07922b..6b832c3f1 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -59,13 +59,11 @@ padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; - line-height: @line-height-small; } &.input-lg { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; - line-height: @line-height-large; } // Nuke default margins from checkboxes and radios to vertically center within. -- cgit v1.2.3 From 98df9495cc92bd710a6d55c4d535da7aaf730031 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 16:15:36 -0700 Subject: remove dupe border-box --- less/input-groups.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 79d1afcd4..5e1ecae7f 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -44,7 +44,6 @@ // Text input groups // ------------------------- .input-group-addon { - .box-sizing(border-box); padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; -- cgit v1.2.3 From a66cdb0c304b701c299bdbf24a53dd6105d4429d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 18:09:56 -0700 Subject: addressing #9189 manually, part 4: input group background var --- less/input-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 56c6cb62c..abc399dc2 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -49,7 +49,7 @@ font-weight: normal; line-height: 1; text-align: center; - background-color: @gray-lighter; + background-color: @input-group-addon-bg; border: 1px solid @input-group-addon-border-color; border-radius: @border-radius-base; -- cgit v1.2.3 From a78c8d9c04e83a22d6eebc2e3d54cb2ccf6b614c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 14:03:57 -0700 Subject: Newfangled input and button group sizing (fixes #9295) Instead of applying `.btn-` or `.input-` to individual elements in button and input groups, we now have new sizing classes to keep your markup a little leaner. * Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to replicate `.input-sm` and `.input-lg`, respectively. * Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your `.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`, respectively. Both sets of new sizing classes simply use the existing individual sizing classes as mixins, so customization of them is automatically inherited when compiling. --- less/input-groups.less | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index abc399dc2..e5e6100d3 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -22,6 +22,17 @@ } } +// Sizing options +// +// Remix the default form control sizing classes into new ones for easier +// manipulation. + +.input-group-lg > .form-control, +.input-group-lg > .input-group-addon { .input-lg(); } +.input-group-sm > .form-control, +.input-group-sm > .input-group-addon { .input-sm(); } + + // Display as table-cell // ------------------------- .input-group-addon, -- cgit v1.2.3 From 49576704ea6c24fbc4cb32f44c5986a1e7714634 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 21:27:15 -0700 Subject: finish fixing #9295: add button group buttons to new input group sizing --- less/input-groups.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index e5e6100d3..153b22957 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -28,9 +28,11 @@ // manipulation. .input-group-lg > .form-control, -.input-group-lg > .input-group-addon { .input-lg(); } +.input-group-lg > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { .input-lg(); } .input-group-sm > .form-control, -.input-group-sm > .input-group-addon { .input-sm(); } +.input-group-sm > .input-group-addon, +.input-group-lg > .input-group-btn > .btn { .input-sm(); } // Display as table-cell -- cgit v1.2.3 From 3a67054536338c613c43078b6f48e5f502bf527d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 14 Aug 2013 19:07:14 -0700 Subject: fix copypasta-o to fully fix #9295 --- less/input-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/input-groups.less') diff --git a/less/input-groups.less b/less/input-groups.less index 153b22957..570f03f90 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -32,7 +32,7 @@ .input-group-lg > .input-group-btn > .btn { .input-lg(); } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, -.input-group-lg > .input-group-btn > .btn { .input-sm(); } +.input-group-sm > .input-group-btn > .btn { .input-sm(); } // Display as table-cell -- cgit v1.2.3