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