From 6564afbe7314d8bccdf202d3e4d9c02a070d6f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20Graakj=C3=A6r=20Grantzau?= Date: Thu, 29 Mar 2012 14:56:53 +0300 Subject: Renaming @gridColumnGutter to @gridGutterWidth --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 0074e8924..158917c00 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -290,7 +290,7 @@ } // CSS3 Content Columns -.content-columns(@columnCount, @columnGap: @gridColumnGutter) { +.content-columns(@columnCount, @columnGap: @gridGutterWidth) { -webkit-column-count: @columnCount; -moz-column-count: @columnCount; column-count: @columnCount; -- cgit v1.2.3 From 37745cd8997bdc1d0bb21c276a7aa671bb018eed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 00:53:38 -0700 Subject: fix fluid grid selectors to remove > in selectors --- less/mixins.less | 3 ++- less/responsive.less | 1 + less/tests/css-tests.html | 53 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 9cef3f1ed..b3fea77db 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -577,7 +577,7 @@ .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { .spanX (@index) when (@index > 0) { - (~"> .span@{index}") { .span(@index); } + (~".span@{index}") { .span(@index); } .spanX(@index - 1); } .spanX (0) {} @@ -590,6 +590,7 @@ width: 100%; .clearfix(); [class*="span"] { + .input-block-level(); float: left; margin-left: @fluidGridGutterWidth; } diff --git a/less/responsive.less b/less/responsive.less index 5434f3a08..bbd76d631 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -8,6 +8,7 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ + // Responsive.less // For phone and tablet devices // ------------------------------------------------------------- diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 1955ebbec..42cdab045 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -269,14 +269,61 @@

Inputs should not extend past the light red background, set on their parent, a .span* column.

-
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
-
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
-
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
-- cgit v1.2.3 From 56ecc6ba96550d8e66d0484c21fc20da5f8e52e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 12:31:56 -0700 Subject: clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html --- less/tests/css-tests.html | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'less') diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 42cdab045..f6f4b2351 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -330,8 +330,51 @@
+
+ + + +
+

Dropdowns

+
+

Dropdown link with hash URL

+ + +

Dropdown link with custom URL and data-target

+ -- cgit v1.2.3 From 2355fd224ddcd571765c5ad2f2242dac65789aa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:06:16 -0700 Subject: remove @shadow instances and replace with escaped values, update mixins to not use a default value at all --- less/button-groups.less | 9 ++------- less/buttons.less | 8 ++------ less/forms.less | 4 +--- less/mixins.less | 20 ++++++++++---------- less/navbar.less | 9 +++------ less/responsive-navbar.less | 3 +-- 6 files changed, 19 insertions(+), 34 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 65c974a39..1261ba5cc 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -93,10 +93,7 @@ .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - @shadow: inset 1px 0 0 rgba(255,255,255,.125), - inset 0 1px 0 rgba(255,255,255,.2), - 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); + .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); *padding-top: 3px; *padding-bottom: 3px; } @@ -121,9 +118,7 @@ // Remove the gradient and set the same inset shadow as the :active state .dropdown-toggle { background-image: none; - @shadow: inset 0 2px 4px rgba(0,0,0,.15), - 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); } // Keep the hover's background when dropdown is open diff --git a/less/buttons.less b/less/buttons.less index a1abb6ef7..4deec92a9 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -21,9 +21,7 @@ border: 1px solid @btnBorder; border-bottom-color: darken(@btnBorder, 10%); .border-radius(4px); - @shadow: inset 0 1px 0 rgba(255,255,255,.2), - 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); cursor: pointer; // Give IE7 some love @@ -56,9 +54,7 @@ .btn.active, .btn:active { background-image: none; - @shadow: inset 0 2px 4px rgba(0,0,0,.15), - 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); background-color: darken(@white, 10%); background-color: darken(@white, 15%) e("\9"); outline: 0; diff --git a/less/forms.less b/less/forms.less index a57732c13..1945bda60 100644 --- a/less/forms.less +++ b/less/forms.less @@ -213,9 +213,7 @@ textarea { input:focus, textarea:focus { border-color: rgba(82,168,236,.8); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), - 0 0 8px rgba(82,168,236,.6); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); outline: 0; outline: thin dotted \9; /* IE6-9 */ } diff --git a/less/mixins.less b/less/mixins.less index b3fea77db..71532fcff 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -70,11 +70,11 @@ // Sizing shortcuts // ------------------------- -.size(@height: 5px, @width: 5px) { +.size(@height, @width) { width: @width; height: @height; } -.square(@size: 5px) { +.square(@size) { .size(@size, @size); } @@ -192,14 +192,14 @@ // -------------------------------------------------- // Border Radius -.border-radius(@radius: 5px) { +.border-radius(@radius) { -webkit-border-radius: @radius; -moz-border-radius: @radius; border-radius: @radius; } // Drop shadows -.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { +.box-shadow(@shadow) { -webkit-box-shadow: @shadow; -moz-box-shadow: @shadow; box-shadow: @shadow; @@ -229,21 +229,21 @@ -o-transform: scale(@ratio); transform: scale(@ratio); } -.translate(@x: 0, @y: 0) { +.translate(@x, @y) { -webkit-transform: translate(@x, @y); -moz-transform: translate(@x, @y); -ms-transform: translate(@x, @y); -o-transform: translate(@x, @y); transform: translate(@x, @y); } -.skew(@x: 0, @y: 0) { +.skew(@x, @y) { -webkit-transform: skew(@x, @y); -moz-transform: skew(@x, @y); -ms-transform: skew(@x, @y); -o-transform: skew(@x, @y); transform: skew(@x, @y); } -.translate3d(@x: 0, @y: 0, @z: 0) { +.translate3d(@x, @y, @z) { -webkit-transform: translate(@x, @y, @z); -moz-transform: translate(@x, @y, @z); -ms-transform: translate(@x, @y, @z); @@ -255,7 +255,7 @@ // Prevent browsers from flickering when using CSS 3D transforms. // Default value is `visible`, but can be changed to `hidden // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples -.backface-visibility(@visibility: visible){ +.backface-visibility(@visibility){ -webkit-backface-visibility: @visibility; -moz-backface-visibility: @visibility; -ms-backface-visibility: @visibility; @@ -297,7 +297,7 @@ } // Resize anything -.resizable(@direction: both) { +.resizable(@direction) { resize: @direction; // Options: horizontal, vertical, both overflow: auto; // Safari fix } @@ -313,7 +313,7 @@ } // Opacity -.opacity(@opacity: 100) { +.opacity(@opacity) { opacity: @opacity / 100; filter: ~"alpha(opacity=@{opacity})"; } diff --git a/less/navbar.less b/less/navbar.less index f2f5153a7..6816a6ab9 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -21,8 +21,7 @@ padding-right: 20px; #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); .border-radius(4px); - @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); + .box-shadow(~"0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)"); } // Set width to auto for default container @@ -39,8 +38,7 @@ margin-left: 5px; margin-right: 5px; .buttonBackground(@navbarBackgroundHighlight, @navbarBackground); - @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)"); } .btn-navbar .icon-bar { display: block; @@ -143,8 +141,7 @@ color: @white; background-color: @navbarSearchBackground; border: 1px solid @navbarSearchBorder; - @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)"); .transition(none); // Placeholder text gets special styles; can't be a grouped selector diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less index 84b0f33f3..2f1c4925a 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -93,8 +93,7 @@ margin: (@baseLineHeight / 2) 0; border-top: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground; - @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); - .box-shadow(@shadow); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)"); } // Pull right (secondary) nav content .navbar .nav.pull-right { -- cgit v1.2.3 From f37d9aeaef12c3019112fa915b7bd4d927652a15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:31:01 -0700 Subject: fix #2856: make inputs using .span* classes responsive at <767px layout --- less/responsive-767px-max.less | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 7a3318a8f..ba34b29a6 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -100,9 +100,9 @@ .row { margin-left: 0; } - // Make all columns even - .row > [class*="span"], - .row-fluid > [class*="span"] { + // Make all grid-sized elements block level again + [class*="span"], + .row-fluid [class*="span"] { float: none; display: block; width: auto; @@ -125,8 +125,11 @@ .input-block-level(); } // But don't let it screw up prepend/append inputs + .input-prepend input, + .input-append input, .input-prepend input[class*="span"], .input-append input[class*="span"] { + display: inline-block; // redeclare so they don't wrap to new lines width: auto; } -- cgit v1.2.3 From d652af10971d79cde92336700e156c63ff2c0b24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 23:53:54 -0700 Subject: fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts --- less/responsive-767px-max.less | 15 +++++++++++++++ less/type.less | 1 + 2 files changed, 16 insertions(+) (limited to 'less') diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index ba34b29a6..b2202b5b7 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -86,6 +86,21 @@ padding: 0; } + // TYPOGRAPHY + // ---------- + // Reset horizontal dl + .dl-horizontal { + dt { + float: none; + clear: none; + width: auto; + text-align: left; + } + dd { + margin-left: 0; + } + } + // GRID & CONTAINERS // ----------------- // Remove width from containers diff --git a/less/type.less b/less/type.less index 4e1407b85..779e85960 100644 --- a/less/type.less +++ b/less/type.less @@ -135,6 +135,7 @@ dd { // Horizontal layout (like forms) .dl-horizontal { dt { + .text-overflow(); float: left; clear: left; width: 120px; -- cgit v1.2.3 From 33fa705c7fa9cc9e8c255cc2e161336ba21b3cff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 00:15:04 -0700 Subject: fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width --- less/navs.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index a02be18f0..4f4b6c327 100644 --- a/less/navs.less +++ b/less/navs.less @@ -266,8 +266,7 @@ .clearfix(); } .tab-content { - display: table; // prevent content from running below tabs - width: 100%; + overflow: auto; // prevent content from running below tabs } // Remove border on bottom, left, right @@ -314,10 +313,6 @@ // ------------ // Common styles -.tabs-left .tab-content, -.tabs-right .tab-content { - width: auto; -} .tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { float: none; -- cgit v1.2.3 From fe05f9aeb259733de4598014db9df9193cc01ea2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 00:59:34 -0700 Subject: fix #2572: streamline thumbnails css to allow for offsets --- less/responsive-1200px-min.less | 3 --- less/responsive-767px-max.less | 6 ----- less/tests/css-tests.html | 50 +++++++++++++++++++++++++++++++++++++++-- less/thumbnails.less | 9 ++++++-- 4 files changed, 55 insertions(+), 13 deletions(-) (limited to 'less') diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less index 9e77a113d..ecb847b37 100644 --- a/less/responsive-1200px-min.less +++ b/less/responsive-1200px-min.less @@ -16,8 +16,5 @@ .thumbnails { margin-left: -30px; } - .thumbnails > li { - margin-left: 30px; - } } diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index b2202b5b7..4b8b41fbe 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -124,12 +124,6 @@ margin: 0; } - // THUMBNAILS - // ---------- - .thumbnails [class*="span"] { - width: auto; - } - // FORM FIELDS // ----------- // Make span* classes full width diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index f6f4b2351..7cf76524b 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -329,9 +329,9 @@
-
+ @@ -339,7 +339,6 @@

Dropdowns

-

Dropdown link with hash URL

+
+ + + + +
+

Thumbnails

+
+ +

Offset thumbnails

+ + + + diff --git a/less/thumbnails.less b/less/thumbnails.less index 3a12d4e50..0dfabdf06 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -1,15 +1,19 @@ // THUMBNAILS // ---------- +// Make wrapper ul behave like the grid .thumbnails { margin-left: -@gridGutterWidth; list-style: none; .clearfix(); } + +// Float li to make thumbnails appear in a row .thumbnails > li { - float: left; - margin: 0 0 @baseLineHeight @gridGutterWidth; + margin-bottom: @baseLineHeight; } + +// The actual thumbnail (can be `a` or `div`) .thumbnail { display: block; padding: 4px; @@ -23,6 +27,7 @@ a.thumbnail:hover { border-color: @linkColor; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } + // Images and captions .thumbnail > img { display: block; -- cgit v1.2.3 From 647f1c98eda0f150e54e9193181acb462a3b9357 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 01:05:00 -0700 Subject: fix #2296: allow fluid thumbnails --- less/responsive-1200px-min.less | 3 +++ less/tests/css-tests.html | 23 ++++++++++++++++++++++- less/thumbnails.less | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less index ecb847b37..3331cfe5b 100644 --- a/less/responsive-1200px-min.less +++ b/less/responsive-1200px-min.less @@ -16,5 +16,8 @@ .thumbnails { margin-left: -30px; } + .row-fluid .thumbnails { + margin-left: 0; + } } diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 7cf76524b..255a078b3 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -421,7 +421,28 @@ - +

Fluid thumbnails

+
+
+ +
+
diff --git a/less/thumbnails.less b/less/thumbnails.less index 0dfabdf06..7fa77afa9 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -7,6 +7,10 @@ list-style: none; .clearfix(); } +// Fluid rows have no left margin +.row-fluid .thumbnails { + margin-left: 0; +} // Float li to make thumbnails appear in a row .thumbnails > li { -- cgit v1.2.3 From 574592cba5dc8c7db9f62b83ff91bc679f98a10e Mon Sep 17 00:00:00 2001 From: Alec Rust Date: Sun, 1 Apr 2012 17:25:43 +0200 Subject: Corrected "resises" to "resides" --- less/modals.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 4fccea738..870ad0dfe 100644 --- a/less/modals.less +++ b/less/modals.less @@ -56,7 +56,7 @@ .close { margin-top: 2px; } } -// Body (where all modal content resises) +// Body (where all modal content resides) .modal-body { overflow-y: auto; max-height: 400px; -- cgit v1.2.3 From 2988de6377d8ccc456af6d4ef1b3064c6c5a1f3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:37:58 -0700 Subject: fix #2913: get more specific with button group selectors --- less/button-groups.less | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 1261ba5cc..7c6a02a67 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -25,14 +25,14 @@ } // Float them, remove border radius, then re-add to first and last elements -.btn-group .btn { +.btn-group > .btn { position: relative; float: left; margin-left: -1px; .border-radius(0); } // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -.btn-group .btn:first-child { +.btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; @@ -41,8 +41,8 @@ -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { +.btn-group > .btn:last-child, +.btn-group > .dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; border-top-right-radius: 4px; @@ -51,7 +51,7 @@ border-bottom-right-radius: 4px; } // Reset corners for large buttons -.btn-group .btn.large:first-child { +.btn-group > .btn.large:first-child { margin-left: 0; -webkit-border-top-left-radius: 6px; -moz-border-radius-topleft: 6px; @@ -60,8 +60,8 @@ -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { +.btn-group > .btn.large:last-child, +.btn-group > .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; -moz-border-radius-topright: 6px; border-top-right-radius: 6px; @@ -71,10 +71,10 @@ } // On hover/focus/active, bring the proper btn to front -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { +.btn-group > .btn:hover, +.btn-group > .btn:focus, +.btn-group > .btn:active, +.btn-group > .btn.active { z-index: 2; } @@ -90,24 +90,24 @@ // ---------------------- // Give the line between buttons some depth -.btn-group .dropdown-toggle { +.btn-group > .dropdown-toggle { padding-left: 8px; padding-right: 8px; .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); *padding-top: 3px; *padding-bottom: 3px; } -.btn-group .btn-mini.dropdown-toggle { +.btn-group > .btn-mini.dropdown-toggle { padding-left: 5px; padding-right: 5px; *padding-top: 1px; *padding-bottom: 1px; } -.btn-group .btn-small.dropdown-toggle { +.btn-group > .btn-small.dropdown-toggle { *padding-top: 4px; *padding-bottom: 4px; } -.btn-group .btn-large.dropdown-toggle { +.btn-group > .btn-large.dropdown-toggle { padding-left: 12px; padding-right: 12px; } -- cgit v1.2.3 From 2ea437f353a636a277320513db04ced4fc0f7da2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:49:19 -0700 Subject: fix #2908: unfloat inputs using .span* in fluid row --- less/forms.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 1945bda60..240de5ed2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -242,7 +242,12 @@ select:focus { input[class*="span"], select[class*="span"], textarea[class*="span"], -.uneditable-input[class*="span"] { +.uneditable-input[class*="span"], +// Redeclare since the fluid row class is more specific +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"] { float: none; margin-left: 0; } -- cgit v1.2.3