From ea56c37ca9674f0155448699918650bbfcfbb888 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Tue, 16 Jun 2015 21:40:15 -0400 Subject: update bootstrap to 3.3.5 --- .../assets/stylesheets/bootstrap/_buttons.scss | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss') diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss index 7f0db458..6452b709 100644 --- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss +++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss @@ -17,7 +17,7 @@ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; white-space: nowrap; - @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); + @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base); @include user-select(none); &, @@ -47,10 +47,18 @@ &[disabled], fieldset[disabled] & { cursor: $cursor-disabled; - pointer-events: none; // Future-proof disabling of clicks @include opacity(.65); @include box-shadow(none); } + + // [converter] extracted a& to a.btn +} + +a.btn { + &.disabled, + fieldset[disabled] & { + pointer-events: none; // Future-proof disabling of clicks on `` elements + } } @@ -126,14 +134,14 @@ .btn-lg { // line-height: ensure even-numbered height of button next to large input - @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large); + @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large); } .btn-sm { // line-height: ensure proper height of button next to small input - @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small); + @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); } .btn-xs { - @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small); + @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); } -- cgit v1.2.3