remove commented out buttons css, update docs

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 87b2942a15da3c32c662a248192d588051d49f46..e3214cbc5d7f8c96855be02d9f32fccd1f8439a8 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2546,11 +2546,17 @@ button.close {
   font-size: 14px;
   font-weight: bold;
   line-height: 20px;
+  color: #555555;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
+  background-color: #eee;
   border: 0;
   border-radius: 4px;
+  -webkit-transition: all 0.075s ease-in-out;
+     -moz-transition: all 0.075s ease-in-out;
+       -o-transition: all 0.075s ease-in-out;
+          transition: all 0.075s ease-in-out;
 }
 
 .btn:focus {
@@ -2561,13 +2567,14 @@ button.close {
 
 .btn:hover {
   text-decoration: none;
+  background-color: #ddd;
 }
 
 .btn:active,
 .btn.active {
   outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1);
 }
 
 .btn.disabled,
@@ -2579,73 +2586,6 @@ button.close {
           box-shadow: none;
 }
 
-.btn-default {
-  padding: 6px 12px;
-  color: #5a5a5a;
-  background-color: #fff;
-  border: 1px solid #ccc;
-}
-
-.btn-default:hover {
-  color: #fff;
-  background-color: #999;
-  border-color: #999;
-}
-
-/*
-// Core
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0; // For input.btn
-  font-size: @font-size-base;
-  line-height: @line-height-base;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  white-space: nowrap;
-  .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid @btn-border;
-  border-bottom-color: darken(@btn-border, 10%);
-  border-radius: @border-radius-base;
-  .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-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
-  &:focus {
-    .tab-focus();
-  }
-
-  // Active state
-  &.active,
-  &:active {
-    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-image: none;
-    .opacity(65);
-    .box-shadow(none);
-  }
-
-}
-*/
-
 .btn-large {
   padding: 11px 19px;
   font-size: 17.5px;

diff --git a/docs/css.html b/docs/css.html
index dd279a6b4c10a5a2947dc08334c968265ae45126..fdf1fe5958859f21f028923f56111baee804e546 100644 (file)
--- a/docs/css.html
+++ b/docs/css.html
@@ -1730,7 +1730,7 @@ For example, <code><section></code> should be wrapped as inlin
             <tbody>
               <tr>
                 <td><button type="button" class="btn btn-default">Default</button></td>
-                <td><code>btn btn-default</code></td>
+                <td><code>btn</code></td>
                 <td>Standard gray button with gradient</td>
               </tr>
               <tr>

diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache
index ff73aef5b7a645e71b9347527946a9fdfbff22e0..78bf7febf23ccaedccb12534cb10855757390d14 100644 (file)
--- a/docs/templates/pages/css.mustache
+++ b/docs/templates/pages/css.mustache
@@ -1670,7 +1670,7 @@ For example, <code><section></code> should be wrapped as inlin
             <tbody>
               <tr>
                 <td><button type="button" class="btn btn-default">Default</button></td>
-                <td><code>btn btn-default</code></td>
+                <td><code>btn</code></td>
                 <td>Standard gray button with gradient</td>
               </tr>
               <tr>

diff --git a/less/buttons.less b/less/buttons.less
index 0aca982b2b863ed01460935741e45a5ad65e6014..72a70f535b9fa32aec042f893390d372db58cfe6 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -15,11 +15,13 @@
   font-weight: bold;
   line-height: @line-height-base;
   text-align: center;
+  color: @gray;
   vertical-align: middle;
   cursor: pointer;
+  background-color: #eee;
   border: 0;
   border-radius: @border-radius-base;
-  //.transition(all .075s ease-in-out);
+  .transition(all .075s ease-in-out);
 
   &:focus {
     .tab-focus();
@@ -27,12 +29,13 @@
 
   &:hover {
     text-decoration: none;
+    background-color: #ddd;
   }
 
   &:active,
   &.active {
     outline: 0;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 0 rgba(255,255,255,.1)");
   }
 
   &.disabled,
@@ -44,73 +47,6 @@
 
 }
 
-// Default button visuals
-.btn-default {
-  padding: 6px 12px;
-  color: #5a5a5a;
-  background-color: #fff;
-  border: 1px solid #ccc;
-
-  &:hover {
-    color: #fff;
-    background-color: #999;
-    border-color: #999;
-  }
-}
-
-/*
-// Core
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0; // For input.btn
-  font-size: @font-size-base;
-  line-height: @line-height-base;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  white-space: nowrap;
-  .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid @btn-border;
-  border-bottom-color: darken(@btn-border, 10%);
-  border-radius: @border-radius-base;
-  .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-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
-  &:focus {
-    .tab-focus();
-  }
-
-  // Active state
-  &.active,
-  &:active {
-    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-image: none;
-    .opacity(65);
-    .box-shadow(none);
-  }
-
-}
-*/
 
 // Button Sizes
 // -------------------------