From: Mark Otto <markotto@twitter.com>
Date: Mon, 9 Jul 2012 07:39:56 +0000 (-0700)
Subject: Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenth... 
X-Git-Tag: v2.1.0~2^2~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50a945e084e0153bd7e087cf29cdb2c176dbf4b8;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip

Conflicts:
	less/buttons.less
---

50a945e084e0153bd7e087cf29cdb2c176dbf4b8
diff --cc less/buttons.less
index c5b58c433d,26f77d7b34..222a587bdc
--- a/less/buttons.less
+++ b/less/buttons.less
@@@ -26,48 -26,48 +26,50 @@@
    border-bottom-color: darken(@btnBorder, 10%);
    .border-radius(4px);
    .ie7-restore-left-whitespace(); // Give IE7 some love
-   .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.15), 0 1px 2px rgba(0,0,0,.05)");
- }
+   .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
  
- // 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;
+   // 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);
- }
+     // 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%) e("\9");
-   background-image: none;
-   outline: 0;
-   .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05)");
- }
+   // Active state
+   &.active,
+   &:active {
+     background-color: darken(@white, 10%);
+     background-color: darken(@white, 15%) e("\9");
+     background-image: none;
+     outline: 0;
+     .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;
+     .opacity(65);
+     .box-shadow(none);
+   }
  
- // Disabled state
- .btn.disabled,
- .btn[disabled] {
-   cursor: default;
-   background-color: darken(@white, 10%);
-   background-image: none;
-   .opacity(65);
-   .box-shadow(none);
  }
  
 +
++
  // Button Sizes
  // --------------------------------------------------