From 2bfda031cebcde7361797dd54badeb91d4cb98cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:43:19 -0800 Subject: darken buttons, uncomment out firefox keyframes from progress bars --- less/buttons.less | 8 ++++---- less/progress-bars.less | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 54d00a13a..d5a4353b3 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -25,19 +25,19 @@ color: rgba(255,255,255,.75); } &.primary { - .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15)); + .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20)); } // Danger and error appear as red &.danger { - .buttonBackground(#ee5f5b, #c43c35); + .buttonBackground(#ee5f5b, #bd362f); } // Success appears as green &.success { - .buttonBackground(#62c462, #57a957); + .buttonBackground(#62c462, #51a351); } // Info appears as a neutral blue &.info { - .buttonBackground(#5bc0de, #339bb9); + .buttonBackground(#5bc0de, #2f96b4); } } diff --git a/less/progress-bars.less b/less/progress-bars.less index 228972f2c..cfca78d68 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -11,11 +11,10 @@ to { background-position: 40px 0; } } -// Temporarily commented out since LESS won't compile with this -// @-moz-keyframes progress-bar-stripes { -// from { background-position: 0 0; } -// to { background-position: 40px 0; } -// } +@-moz-keyframes progress-bar-stripes { + from { background-position: 0 0; } + to { background-position: 40px 0; } +} // Spec @keyframes progress-bar-stripes { -- cgit v1.2.3 From b77161f8647f791319c684a191c2308b6dd05100 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:49:26 -0800 Subject: reset border-radius only for ie9? --- 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 b8cb48b48..9565c52d7 100644 --- a/less/forms.less +++ b/less/forms.less @@ -86,7 +86,7 @@ input[type="radio"] { line-height: normal; border: none; cursor: pointer; - .border-radius(0); + border-radius: 0 e("\0/"); } // Reset the file input to browser defaults -- cgit v1.2.3 From 70c6a6cd855a617b086682ef919e02cf67d4e86e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:58:26 -0800 Subject: fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices --- less/forms.less | 1 + less/responsive.less | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 9565c52d7..f327b4faa 100644 --- a/less/forms.less +++ b/less/forms.less @@ -85,6 +85,7 @@ input[type="radio"] { *margin-top: 0; /* IE7 */ line-height: normal; border: none; + border: initial; cursor: pointer; border-radius: 0 e("\0/"); } diff --git a/less/responsive.less b/less/responsive.less index 24b58d2ab..4ce4aff72 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -50,7 +50,8 @@ } // Move over buttons in .form-actions to align with .controls .form-horizontal .form-actions { - padding-left: 0; + padding-left: 10px; + padding-right: 10px; } // Modals -- cgit v1.2.3 From 296d06a285d91200b4063f3bdde65c094495ee24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 13:07:01 -0800 Subject: add checkbox/radio border for ios in responsive --- less/forms.less | 3 +-- less/responsive.less | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index f327b4faa..3792bf420 100644 --- a/less/forms.less +++ b/less/forms.less @@ -84,8 +84,7 @@ input[type="radio"] { margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; - border: none; - border: initial; + border: 0; cursor: pointer; border-radius: 0 e("\0/"); } diff --git a/less/responsive.less b/less/responsive.less index 4ce4aff72..2d49f2095 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -33,6 +33,12 @@ line-height: @baseLineHeight; } + // Update checkboxes for iOS + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + // Remove the horizontal form styles .form-horizontal .control-group > label { float: none; -- cgit v1.2.3 From 1a22c3b30aa67b4f092b164fad188050af8bbab2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 13:13:01 -0800 Subject: restore IE filters, but reset them on buttons --- less/mixins.less | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 5daa22234..2bfcd053e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -298,6 +298,7 @@ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(left, @startColor, @endColor); // Le standard background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down } .vertical(@startColor: #555, @endColor: #333) { background-color: mix(@startColor, @endColor, 60%); @@ -308,6 +309,7 @@ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(top, @startColor, @endColor); // The standard background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down } .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; @@ -327,6 +329,7 @@ background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback } .radial(@innerColor: #555, @outerColor: #333) { background-color: @outerColor; @@ -347,6 +350,10 @@ background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); } } +// Reset filters for IE +.reset-filter() { + filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); +} // Mixin for generating button backgrounds @@ -354,6 +361,7 @@ .buttonBackground(@startColor, @endColor) { // gradientBar will set the background to a pleasing blend of these, to support IE<=9 .gradientBar(@startColor, @endColor); + .reset-filter(); // in these cases the gradient won't cover the background, so we override &:hover, &:active, &.active, &.disabled, &[disabled] { -- cgit v1.2.3