_buttons.scss in sass-twitter-bootstrap-2.2.1

- old
+ new

@@ -8,11 +8,11 @@
 
 // Core
 .btn {
   display: inline-block;
   @include ie7-inline-block();
-  padding: 4px 14px;
+  padding: 4px 12px;
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   *line-height: $baseLineHeight;
   text-align: center;
@@ -20,13 +20,13 @@
   cursor: pointer;
   @include buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid $btnBorder;
   *border: 0; // Remove the border to prevent IE7's black border on input:focus
   border-bottom-color: darken($btnBorder, 10%);
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   @include ie7-restore-left-whitespace(); // Give IE7 some love
-  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
+  @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;
@@ -49,11 +49,11 @@
   &: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)});
+    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
   }
 
   // Disabled state
   &.disabled,
   &[disabled] {
@@ -71,33 +71,34 @@
 // Button Sizes
 // --------------------------------------------------
 
 // Large
 .btn-large {
-  padding: 9px 14px;
-  font-size: $baseFontSize + 2px;
-  line-height: normal;
-  @include border-radius(5px);
+  padding: $paddingLarge;
+  font-size: $fontSizeLarge;
+  @include border-radius($borderRadiusLarge);
 }
-.btn-large [class^="icon-"] {
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
   margin-top: 2px;
 }
 
 // Small
 .btn-small {
-  padding: 3px 9px;
-  font-size: $baseFontSize - 2px;
-  line-height: $baseLineHeight - 2px;
+  padding: $paddingSmall;
+  font-size: $fontSizeSmall;
+  @include border-radius($borderRadiusSmall);
 }
-.btn-small [class^="icon-"] {
-  margin-top: 0px;
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
 }
 
 // Mini
 .btn-mini {
-  padding: 2px 6px;
-  font-size: $baseFontSize - 3px;
-  line-height: $baseLineHeight - 3px;
+  padding: $paddingMini;
+  font-size: $fontSizeMini;
+  @include border-radius($borderRadiusSmall);
 }
 
 
 // Block button
 // -------------------------