_buttons.sass in sass-rails-bootstrap-2.1.0

- old
+ new

@@ -1,68 +1,67 @@
-// BUTTON STYLES
-// -------------
+//
+// Button styles
+// --------------------------------------------------
 
 
 // Base styles
 // --------------------------------------------------
 
 // Core
 .btn
   display: inline-block
   +ie7-inline-block
-  padding: 4px 10px 4px
+  padding: 4px 14px
   margin-bottom: 0  // For input.btn
-  font-size: $baseFontSize
-  line-height: $baseLineHeight
+  font-size: 13px
+  line-height: 20px
   *line-height: 20px
-  color: $grayDark
   text-align: center
-  text-shadow: 0 1px 1px rgba(255,255,255,.75)
   vertical-align: middle
   cursor: pointer
-  +button-background($btnBackground, $btnBackgroundHighlight)
+  +button-background($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%)
   +border-radius(4px)
   +ie7-restore-left-whitespace  // Give IE7 some love
-  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)
+  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 2px rgba(0,0,0,.05)
   +box-shadow($shadow)
 
-// Hover state
-.btn: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)
+  // 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)
 
-// Focus state for keyboard and accessibility
-.btn:focus
-  +tab-focus
+  // Focus state for keyboard and accessibility
+  &:focus
+    +tab-focus
 
-// Active state
-.btn.active,
-.btn: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,.15), 0 1px 2px rgba(0,0,0,.05)
-  +box-shadow($shadow)
-  
-// Disabled state
-.btn.disabled,
-.btn[disabled]
-  cursor: default
-  background-color: darken($white, 10%)
-  background-image: none
-  +opacity(65)
-  +box-shadow(none)
+  // 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
 // --------------------------------------------------
 
 // Large
@@ -70,47 +69,40 @@
   padding: 9px 14px
   font-size: $baseFontSize + 2px
   line-height: normal
   +border-radius(5px)
   [class^="icon-"]
-    margin-top: 1px
+    margin-top: 2px
     
 // Small
 .btn-small
-  padding: 5px 9px
+  padding: 3px 9px
   font-size: $baseFontSize - 2px
   line-height: $baseLineHeight - 2px
   [class^="icon-"]
-    margin-top: -1px
+    margin-top: 0
     
 // Mini
 .btn-mini
   padding: 2px 6px
   font-size: $baseFontSize - 2px
   line-height: $baseLineHeight - 4px
+
+// Block button
+.btn-block
+  display: block
+  width: 100%
+  padding-left: 0
+  padding-right: 0
+  +box-sizing(border-box)
+.btn-block + .btn-block
+  margin-top: 5px
       
       
 // Alternate buttons
 // --------------------------------------------------
 
-// Set text color
-// -------------------------
-.btn-primary,
-.btn-primary:hover,
-.btn-warning,
-.btn-warning:hover,
-.btn-danger,
-.btn-danger:hover,
-.btn-success,
-.btn-success:hover,
-.btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover
-  color: $white
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25)
-    
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
@@ -120,12 +112,12 @@
     
 // Set the backgrounds
 // -------------------------
 .btn
   // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25)
+  border-color: #c5c5c5
+  border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25)
 .btn-primary
   +button-background($btnPrimaryBackground, $btnPrimaryBackgroundHighlight)
 // Warning appears as orange
 .btn-warning
   +button-background($btnWarningBackground, $btnWarningBackgroundHighlight)
@@ -152,16 +144,39 @@
   &::-moz-focus-inner
     padding: 0
     border: 0
     
   // IE7 has some default padding on button controls
-  *padding-top: 2px
-  *padding-bottom: 2px
+  *padding-top: 3px
+  *padding-bottom: 3px
+
   &.btn-large
     *padding-top: 7px
     *padding-bottom: 7px
   &.btn-small
     *padding-top: 3px
     *padding-bottom: 3px
   &.btn-mini
     *padding-top: 1px
     *padding-bottom: 1px
+
+
+// Link buttons
+// --------------------------------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active
+  background-color: transparent
+  background-image: none
+  +box-shadow(none)
+
+.btn-link
+  border-color: transparent
+  cursor: pointer
+  color: $linkColor
+  +border-radius(0)
+
+.btn-link:hover
+  color: $linkColorHover
+  text-decoration: underline
+  background-color: transparent