buttons and button group flattening improvements

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 469c6f42fa98adbd123f4f6f7f3b5e41542f7164..22d6a97f35ba1f3a8cf05b831fee15ccf6fa6501 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2417,7 +2417,6 @@ button.close {
   font-weight: bold;
   line-height: 20px;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   vertical-align: middle;
   cursor: pointer;
   border: 1px solid #a7a9aa;
@@ -2595,6 +2594,11 @@ fieldset[disabled] .btn-link:hover {
   text-decoration: none;
 }
 
+.caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
 .btn-group {
   position: relative;
   display: inline-block;
@@ -2635,18 +2639,6 @@ fieldset[disabled] .btn-link:hover {
   margin-left: 1px;
 }
 
-.btn-group > .btn-mini {
-  font-size: 10.5px;
-}
-
-.btn-group > .btn-small {
-  font-size: 11.9px;
-}
-
-.btn-group > .btn-large {
-  font-size: 17.5px;
-}
-
 .btn-group > .btn:first-child {
   margin-left: 0;
   border-bottom-left-radius: 4px;
@@ -2727,9 +2719,7 @@ fieldset[disabled] .btn-link:hover {
 }
 
 .btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
+  border-width: 5px;
 }
 
 .btn-mini .caret,
@@ -2741,16 +2731,6 @@ fieldset[disabled] .btn-link:hover {
   border-bottom-width: 5px;
 }
 
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-
 .btn-group-vertical > .btn {
   display: block;
   float: none;

diff --git a/docs/components.html b/docs/components.html
index 20ac32133957c83588459e266f4f348182a72b61..c0dfd6cc790f1f5e64a66da06c929baab068dbcd 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -310,26 +310,6 @@
                   <li><a href="#">Separated link</a></li>
                 </ul>
               </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-info dropdown-toggle" data-toggle="dropdown">Info <span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">Inverse <span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
             </div><!-- /btn-toolbar -->
           </div>
 <pre class="prettyprint linenums">
@@ -448,28 +428,6 @@
                   <li><a href="#">Separated link</a></li>
                 </ul>
               </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-info">Info</button>
-                <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-inverse">Inverse</button>
-                <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
             </div><!-- /btn-toolbar -->
           </div>
 <pre class="prettyprint linenums">

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index f7fc48ba5b37227425410515c77a44c348314139..f56fbc9d02e47ef7df3435911d16f57df32f3990 100644 (file)
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -242,26 +242,6 @@
                   <li><a href="#">Separated link</a></li>
                 </ul>
               </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-info dropdown-toggle" data-toggle="dropdown">Info <span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">Inverse <span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
             </div><!-- /btn-toolbar -->
           </div>{{! /example }}
 <pre class="prettyprint linenums">
@@ -380,28 +360,6 @@
                   <li><a href="#">Separated link</a></li>
                 </ul>
               </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-info">Info</button>
-                <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
-              <div class="btn-group">
-                <button class="btn btn-inverse">Inverse</button>
-                <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Separated link</a></li>
-                </ul>
-              </div><!-- /btn-group -->
             </div><!-- /btn-toolbar -->
           </div>{{! /example }}
 <pre class="prettyprint linenums">

diff --git a/less/button-groups.less b/less/button-groups.less
index fcc0acb4ce3201d898482cf4403b9b7b8c0c23d3..00cd786347b9af70f001d14bebbf7b1d2ed202d3 100644 (file)
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -2,6 +2,11 @@
 // Button groups
 // --------------------------------------------------
 
+// Button carets
+.caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
 
 // Make the div behave like a button
 .btn-group {
@@ -124,9 +129,7 @@
   margin-top: 6px;
 }
 .btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
+  border-width: 5px;
 }
 .btn-mini .caret,
 .btn-small .caret {
@@ -138,22 +141,6 @@
 }
 
 
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: #fff;
-    border-bottom-color: #fff;
-  }
-}
-
-
-
 // Vertical button groups
 // ----------------------
 

diff --git a/less/buttons.less b/less/buttons.less
index d0ada16ff650e50b0138b24704a80ac9dfbe0e3a..9292bb3315a639ec9411c32a6e87154537f7ed65 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -15,7 +15,6 @@
   font-weight: bold;
   line-height: @line-height-base;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   vertical-align: middle;
   cursor: pointer;
   border: 1px solid @btn-border;