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

Conflicts:
	less/buttons.less

less/buttons.less

@@ -26,11 +26,10 @@
   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 {
+  // Hover state
+  &:hover {
     color: @grayDark;
     text-decoration: none;
     background-color: darken(@white, 10%);
@@ -40,34 +39,37 @@
     // 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 {
+  // Focus state for keyboard and accessibility
+  &:focus {
     .tab-focus();
-}
+  }
 
-// Active state
-.btn.active,
-.btn:active {
+  // 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,.1), 0 1px 2px rgba(0,0,0,.05)");
-}
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
 
-// Disabled state
-.btn.disabled,
-.btn[disabled] {
+  // Disabled state
+  &.disabled,
+  &[disabled] {
     cursor: default;
     background-color: darken(@white, 10%);
     background-image: none;
     .opacity(65);
     .box-shadow(none);
+  }
+
 }
 
 
+
 // Button Sizes
 // --------------------------------------------------