vendor/assets/stylesheets/twitter/bootstrap/_buttons.sass in sass-rails-bootstrap-2.2.1 vs vendor/assets/stylesheets/twitter/bootstrap/_buttons.sass in sass-rails-bootstrap-2.2.2

- old
+ new

@@ -10,13 +10,12 @@ .btn display: inline-block +ie7-inline-block padding: 4px 12px margin-bottom: 0 // For input.btn - font-size: 13px - line-height: 20px - *line-height: 20px + font-size: $baseFontSize + line-height: $baseLineHeight text-align: center vertical-align: middle cursor: pointer +button-background($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75)) border: 1px solid $btnBorder @@ -29,12 +28,10 @@ // Hover state &:hover color: $grayDark text-decoration: none - background-color: darken($white, 10%) - *background-color: darken($white, 15%) /* Buttons in IE7 don't get borders, so darken on hover */ background-position: 0 -15px // transition is only when going to hover, otherwise the background // behind the gradient (there for IE<=9 fallback) gets mismatched +transition(background-position .1s linear) @@ -43,22 +40,19 @@ +tab-focus // Active state &.active, &:active - background-color: darken($white, 10%) - background-color: darken($white, 15%) #{"\9"} background-image: none outline: 0 $shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05) +box-shadow($shadow) // Disabled state &.disabled, &[disabled] cursor: default - background-color: darken($white, 10%) background-image: none +opacity(65) +box-shadow(none) // Button sizes @@ -69,19 +63,22 @@ padding: $paddingLarge font-size: $fontSizeLarge +border-radius($borderRadiusLarge) .btn-large [class^="icon-"], .btn-large [class*=" icon-"] - margin-top: 2px + margin-top: 4px // Small .btn-small padding: $paddingSmall font-size: $fontSizeSmall +border-radius($borderRadiusSmall) .btn-small [class^="icon-"], .btn-small [class*=" icon-"] margin-top: 0 +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] + margin-top: -1px // Mini .btn-mini padding: $paddingMini font-size: $fontSizeMini