From 1b7a3ca416e51414e8dc3f395f2f58d8ceb4bb15 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Mon, 27 Aug 2012 19:10:20 -0400 Subject: Changed box-shadow mixin to accept infinite, comma separated, shadows --- less/mixins.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 785ac6c2e..989ac0d70 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -251,10 +251,11 @@ } // Drop shadows -.box-shadow(@shadow) { - -webkit-box-shadow: @shadow; - -moz-box-shadow: @shadow; - box-shadow: @shadow; +.box-shadow(@shadowA, @shadowB:X, ...){ + @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; + -webkit-box-shadow: @props; + -moz-box-shadow: @props; + box-shadow: @props; } // Transitions -- cgit v1.2.3 From 96a1797af123e73ba05cc1b6ce5aa8ef0ef17694 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Mon, 27 Aug 2012 19:13:11 -0400 Subject: No longer need to write box-shadows in full when using lighten or other functions --- less/mixins.less | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 989ac0d70..7fcd14c8e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -183,10 +183,7 @@ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { border-color: darken(@borderColor, 10%); - // Write out in full since the lighten() function isn't easily escaped - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)); } } // Give a small background color for input-prepend/-append -- cgit v1.2.3 From 67eae2a5038d5203220450c2a22ea559ab52d897 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Mon, 27 Aug 2012 19:13:37 -0400 Subject: Do not need to write box-shadow in full --- less/navbar.less | 4 +--- less/scaffolding.less | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 64e2eb7ea..25651b14a 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -262,9 +262,7 @@ color: @navbarLinkColorActive; text-decoration: none; background-color: @navbarLinkBackgroundActive; - -webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,.125); - -moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125); - box-shadow: inset 0 3px 8px rgba(0,0,0,.125); + .box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); } // Navbar button for toggling navbar items in responsive layouts diff --git a/less/scaffolding.less b/less/scaffolding.less index 342dcf705..4c735ba88 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -41,9 +41,7 @@ a:hover { background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.2); - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.1); + .box-shadow(0 1px 3px rgba(0,0,0,.1)); } .img-circle { -- cgit v1.2.3 From 2719ac3e9bec37813e1fd69e2ab69c9a015be647 Mon Sep 17 00:00:00 2001 From: Luis Aleman Date: Mon, 27 Aug 2012 19:14:00 -0400 Subject: Unescaped box-shadows to take advantage of new box-shadow mixin --- less/button-groups.less | 4 ++-- less/buttons.less | 4 ++-- less/forms.less | 2 +- less/navbar.less | 8 ++++---- less/progress-bars.less | 2 +- less/responsive-navbar.less | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 7bd639aac..62e53f373 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -120,7 +120,7 @@ .btn-group > .btn + .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)"); + .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: 5px; *padding-bottom: 5px; } @@ -147,7 +147,7 @@ // Remove the gradient and set the same inset shadow as the :active state .dropdown-toggle { background-image: none; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); + .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 08ece791c..177e20049 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -24,7 +24,7 @@ border-bottom-color: darken(@btnBorder, 10%); .border-radius(4px); .ie7-restore-left-whitespace(); // Give IE7 some love - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); // Hover state &:hover { @@ -51,7 +51,7 @@ background-color: darken(@white, 15%) e("\9"); background-image: none; outline: 0; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); + .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); } // Disabled state diff --git a/less/forms.less b/less/forms.less index d2445b987..eb0971f4c 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)); } } diff --git a/less/navbar.less b/less/navbar.less index 25651b14a..3514c40e0 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -202,7 +202,7 @@ .navbar-fixed-top, .navbar-static-top { .navbar-inner { - .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)"); + .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)); } } @@ -210,7 +210,7 @@ .navbar-fixed-bottom { bottom: 0; .navbar-inner { - .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)"); + .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)); } } @@ -274,7 +274,7 @@ margin-left: 5px; margin-right: 5px; .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)"); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)); } .navbar .btn-navbar .icon-bar { display: block; @@ -446,7 +446,7 @@ color: @white; background-color: @navbarInverseSearchBackground; border-color: @navbarInverseSearchBorder; - .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); + .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)); .transition(none); .placeholder(@navbarInverseSearchPlaceholderColor); diff --git a/less/progress-bars.less b/less/progress-bars.less index 36744d89c..0486371aa 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -66,7 +66,7 @@ .transition(width .6s ease); } .progress .bar + .bar { - .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)"); + .box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)); } // Striped bars diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less index 4ffa5a9fe..c454dd5e3 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -129,7 +129,7 @@ margin: (@baseLineHeight / 2) 0; border-top: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground; - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)"); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)); } .navbar-inverse .nav-collapse .navbar-form, .navbar-inverse .nav-collapse .navbar-search { -- cgit v1.2.3 From 2137cd65fb528d0eadd15c2554250a12b5764bfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Aug 2012 13:05:43 -0700 Subject: fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake --- less/responsive-767px-max.less | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'less') diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 3202c1905..eebecb8e4 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -132,24 +132,26 @@ } // Remove the horizontal form styles - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - // Move over all input controls and content - .form-horizontal .controls { - margin-left: 0; - } - // Move the options list down to align with labels - .form-horizontal .control-list { - padding-top: 0; // has to be padding because margin collaspes - } - // Move over buttons in .form-actions to align with .controls - .form-horizontal .form-actions { - padding-left: 10px; - padding-right: 10px; + .form-horizontal { + .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + // Move over all input controls and content + .controls { + margin-left: 0; + } + // Move the options list down to align with labels + .control-list { + padding-top: 0; // has to be padding because margin collaspes + } + // Move over buttons in .form-actions to align with .controls + .form-actions { + padding-left: 10px; + padding-right: 10px; + } } // Modals -- cgit v1.2.3 From 2da2169a56bf16c24c10914deaead344e2af3bb0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Aug 2012 13:06:47 -0700 Subject: fixes #4828: make fluid grid inputs size the same as fixed grid inputs --- less/responsive-767px-max.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index eebecb8e4..79c7eaa82 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -61,8 +61,9 @@ .row-fluid [class*="span"] { float: none; display: block; - width: auto; + width: 100%; margin-left: 0; + .box-sizing(border-box); } .span12, .row-fluid .span12 { -- cgit v1.2.3 From beb0b640967e69e50d1f813a99e8998e27787fdb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Aug 2012 14:02:18 -0700 Subject: fixes #4889: btn-link disabled styles --- less/buttons.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 08ece791c..c80986ea7 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -208,7 +208,8 @@ input[type="submit"].btn { // Make a button look and behave like a link .btn-link, -.btn-link:active { +.btn-link:active, +.btn-link[disabled] { background-color: transparent; background-image: none; .box-shadow(none); @@ -224,3 +225,7 @@ input[type="submit"].btn { text-decoration: underline; background-color: transparent; } +.btn-link[disabled]:hover { + color: @grayDark; + text-decoration: none; +} -- cgit v1.2.3 From 0f85e8b7f820a83559870ce0c00d5ea884475fdc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Aug 2012 22:37:46 -0700 Subject: fixes #4824: scope table grid sizes to .table instead of table --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 9816d8973..13c37c6e8 100644 --- a/less/tables.less +++ b/less/tables.less @@ -180,7 +180,7 @@ table [class*=span], } // Change the column widths to account for td/th padding -table { +.table { .span1 { .tableColumns(1); } .span2 { .tableColumns(2); } .span3 { .tableColumns(3); } -- cgit v1.2.3 From 02f6bd65f5cd44b41e49d23ed7e6a068a04805a6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 1 Sep 2012 12:00:13 -0700 Subject: fixes #4910: use @baseLineHeight * 1.5 for .lead font-size --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 14f65f2fa..0afb864cc 100644 --- a/less/type.less +++ b/less/type.less @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: @baseLineHeight; - font-size: 20px; + font-size: @baseLineHeight * 1.5; font-weight: 200; line-height: @baseLineHeight * 1.5; } -- cgit v1.2.3 From 37379048599c1ce93aa2f36df46afbc09cb6d19b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 2 Sep 2012 13:25:03 -0700 Subject: fixes #4922: use basefontsize for realz on .lead --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 0afb864cc..669c55fd5 100644 --- a/less/type.less +++ b/less/type.less @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: @baseLineHeight; - font-size: @baseLineHeight * 1.5; + font-size: @baseFontSize * 1.5; font-weight: 200; line-height: @baseLineHeight * 1.5; } -- cgit v1.2.3 From 9d5f9eca85b9d413b4389b744bbf57c20c447c2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Sep 2012 00:47:48 -0700 Subject: fixes #4909: add color utility classes .text-warning, etc and document them --- less/type.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'less') diff --git a/less/type.less b/less/type.less index 669c55fd5..2e0f386ee 100644 --- a/less/type.less +++ b/less/type.less @@ -32,9 +32,23 @@ em { cite { font-style: normal; } + +// Utility classes .muted { color: @grayLight; } +.text-warning { + color: @warningText; +} +.text-error { + color: @errorText; +} +.text-info { + color: @infoText; +} +.text-success { + color: @successText; +} // Headings -- cgit v1.2.3 From f25129361be813af4c399da8e3041a43ccd2a943 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Sep 2012 01:04:53 -0700 Subject: add comment to go with updated box-shadow mixin --- less/mixins.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 51ee3e336..295f19228 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -249,6 +249,7 @@ // Drop shadows .box-shadow(@shadowA, @shadowB:X, ...){ + // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; -webkit-box-shadow: @props; -moz-box-shadow: @props; -- cgit v1.2.3 From 8cda830eaf568be8204a96ca635c0bed373028ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Sep 2012 01:13:42 -0700 Subject: fixes #4146: IE7-8 responsive image helper --- less/reset.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/reset.less b/less/reset.less index fc27e9c87..3261124e0 100644 --- a/less/reset.less +++ b/less/reset.less @@ -78,6 +78,7 @@ sub { img { max-width: 100%; // Make images inherently responsive + width: auto\9; /* IE7-8 need help adjusting responsive images */ height: auto; // Make images inherently responsive vertical-align: middle; border: 0; -- cgit v1.2.3 From acf2a64016a94c2017ab8aa0ec694835ee1ea42c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Sep 2012 17:35:35 -0700 Subject: fixes #4935: properly comment responsive image techniques and add CSS tests to support --- less/reset.less | 6 ++++-- less/tests/css-tests.html | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/reset.less b/less/reset.less index 3261124e0..2901a85c8 100644 --- a/less/reset.less +++ b/less/reset.less @@ -77,9 +77,11 @@ sub { // ------------------------- img { - max-width: 100%; // Make images inherently responsive + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; /* Part 1: Set a maxium relative to the parent */ width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; // Make images inherently responsive + height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 471514339..c0cb1485e 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -98,6 +98,44 @@ + + +
+

Responsive images

+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +

+ + + + -- cgit v1.2.3 From de36456f5d3498320fae6e2ad106a9a7f38910cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Sep 2012 11:00:25 -0700 Subject: fixes #4957: use input border var for select element instead of #ddd --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index b4b86f907..f8d8562b6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -162,7 +162,7 @@ input[type="file"] { // Make select elements obey height by applying a border select { width: 220px; // default input width + 10px of padding that doesn't get applied - border: 1px solid #bbb; + border: 1px solid @inputBorder; background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color } -- cgit v1.2.3 From a1d2ee654209305f20a621c4956417463d4cb00f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Sep 2012 11:08:08 -0700 Subject: fixes #4885: correct use of skew in .skew() mixin for FF --- 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 295f19228..67f1c0af7 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -295,7 +295,7 @@ .skew(@x, @y) { -webkit-transform: skew(@x, @y); -moz-transform: skew(@x, @y); - -ms-transform: skew(@x, @y); + -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew(@x, @y); transform: skew(@x, @y); } -- cgit v1.2.3 From 73ef263d5fe39f1b22158e5945707f5183c78099 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Sep 2012 11:31:48 -0700 Subject: improve comments in image styles --- less/scaffolding.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/scaffolding.less b/less/scaffolding.less index 4c735ba88..7a7496a64 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -32,10 +32,12 @@ a:hover { // Images // ------------------------- +// Rounded corners .img-rounded { .border-radius(6px); } +// Add polaroid-esque trim .img-polaroid { padding: 4px; background-color: #fff; @@ -44,6 +46,7 @@ a:hover { .box-shadow(0 1px 3px rgba(0,0,0,.1)); } +// Perfect circle .img-circle { - .border-radius(500px); + .border-radius(500px); // crank the border-radius so it works with most reasonably sized images } -- cgit v1.2.3 From 5ff5d351bfbdf13ea93ccfed79743e62f50f9747 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 5 Sep 2012 19:07:53 +0300 Subject: Do not force white icons in active tab links Active `.nav-tabs` elements are not blue (like pills), so forcing a white icon there is not appropriate. --- less/sprites.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/sprites.less b/less/sprites.less index 9bf970fa9..6d3aaef32 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -30,8 +30,6 @@ /* White icons with optional class, or on hover/active states of certain elements */ .icon-white, -.nav-tabs > .active > a > [class^="icon-"], -.nav-tabs > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], .nav-list > .active > a > [class^="icon-"], -- cgit v1.2.3 From 08b8571cb842e9fc668d9faf6c305a51523b27fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Sep 2012 10:00:57 -0700 Subject: version bump to get this started --- less/bootstrap.less | 2 +- less/responsive.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/bootstrap.less b/less/bootstrap.less index aaa3d8a6f..3055c5cc4 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.1 + * Bootstrap v2.1.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/responsive.less b/less/responsive.less index 87b347085..e56042e4e 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.1 + * Bootstrap Responsive v2.1.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3 From d4a16d35eb031cc4cffa4a3c4456fab406e286e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Sep 2012 10:05:54 -0700 Subject: fixes #4996: incorrect border radius on a table --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 13c37c6e8..e5b3f3979 100644 --- a/less/tables.less +++ b/less/tables.less @@ -133,7 +133,7 @@ table { colgroup + tbody tr:first-child td:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; - -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; } } -- cgit v1.2.3 From cc4f8b9f6c735400d76357884f8aa35d26e81574 Mon Sep 17 00:00:00 2001 From: "Dionysios G. Arvanitis" Date: Fri, 7 Sep 2012 17:54:15 +0300 Subject: remove offset margin in row-fluid mobile layout --- less/responsive-767px-max.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 79c7eaa82..6e4261047 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -70,6 +70,9 @@ width: 100%; .box-sizing(border-box); } + .row-fluid [class*="offset"]:first-child { + margin-left: 0; + } // FORM FIELDS // ----------- -- cgit v1.2.3 From 7a0f5c6c00ab7f70346e59503f850c5b5623f908 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Sep 2012 11:04:51 -0700 Subject: fixes #5010: .pager span selector should be scoped to immediate children only --- less/pager.less | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'less') diff --git a/less/pager.less b/less/pager.less index a7629d3db..da2425367 100644 --- a/less/pager.less +++ b/less/pager.less @@ -12,28 +12,29 @@ .pager li { display: inline; } -.pager a, -.pager span { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; .border-radius(15px); } -.pager a:hover { +.pager li > a:hover { text-decoration: none; background-color: #f5f5f5; } -.pager .next a, -.pager .next span { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover, -.pager .disabled span { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > span { color: @grayLight; background-color: #fff; cursor: default; -- cgit v1.2.3 From f2bd7d9f276753a8a2ab27490d06c2a081abb3af Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Sep 2012 11:10:00 -0700 Subject: fixes #5018: .btn-block in .modal-footer no longer has left margin --- less/modals.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 81cacb7ab..a0401c4d1 100644 --- a/less/modals.less +++ b/less/modals.less @@ -95,4 +95,8 @@ .btn-group .btn + .btn { margin-left: -1px; } + // and override it for block buttons as well + .btn-block + .btn-block { + margin-left: 0; + } } -- cgit v1.2.3 From 61332d727e6e1d67def803b2f8d61047d79db0cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Sep 2012 11:34:05 -0700 Subject: fixes #5020: submenu support in dropup --- less/dropdowns.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 390c37497..bed158612 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -163,6 +163,8 @@ .dropdown-submenu { position: relative; } + +// Default dropdowns .dropdown-submenu > .dropdown-menu { top: 0; left: 100%; @@ -176,6 +178,18 @@ display: block; } +// Dropups +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} + +// Caret to indicate there is a submenu .dropdown-submenu > a:after { display: block; content: " "; -- cgit v1.2.3