vendor/frameworks/twitter/bootstrap/buttons.scss in anjlab-bootstrap-rails-2.2.1.2 vs vendor/frameworks/twitter/bootstrap/buttons.scss in anjlab-bootstrap-rails-2.2.2.rc

- old
+ new

@@ -12,11 +12,10 @@ @include ie7-inline-block(); padding: 4px 12px; margin-bottom: 0; // For input.btn font-size: $baseFontSize; line-height: $baseLineHeight; - *line-height: $baseLineHeight; text-align: center; vertical-align: middle; cursor: pointer; @include button-background($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75)); border: 1px solid $btnBorder; @@ -27,17 +26,15 @@ @include box-shadow((inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))); // 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; + text-decoration: none; + 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 is only when going to hover, otherwise the background + // behind the gradient (there for IE<=9 fallback) gets mismatched @include transition(background-position .1s linear); } // Focus state for keyboard and accessibility &:focus { @@ -45,22 +42,19 @@ } // Active state &.active, &:active { - background-color: darken($white, 10%); - background-color: darken($white, 15%) \9; background-image: none; outline: 0; @include box-shadow((inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05))); } // Disabled state &.disabled, &[disabled] { cursor: default; - background-color: darken($white, 10%); background-image: none; @include opacity(65); @include box-shadow(none); } @@ -77,10 +71,10 @@ font-size: $fontSizeLarge; @include border-radius($borderRadiusLarge); } .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 2px; + margin-top: 4px; } // Small .btn-small { padding: $paddingSmall;