css/bootstrap.css

@@ -43,4 +43,3 @@
 @import "carousel.css";
 @import "hero-unit.css";
 @import "utilities.css";
-@import "caret.css";

css/button-groups.css

@@ -3,98 +3,100 @@
 	========================================
 */
 
-/* Make the div behave like a button container */
+/* Make the div behave like a button */
 .btn-group {
 	position: relative;
-	display: inline-flex;
+	display: inline-block;
+	font-size: 0;
+	/* remove as part 1 of font-size inline-block hack */
 	vertical-align: middle;
+	/* match .btn alignment given font-size hack above */
+	white-space: nowrap;
+	/* prevent buttons from wrapping when in tight spaces */
 }
 
 /* Space out series of button groups */
-.btn-group + .btn-group {
+.btn-group+.btn-group {
 	margin-left: 5px;
 }
 
 /* Optional: Group multiple button groups together for a toolbar */
 .btn-toolbar {
-	display: flex;
+	font-size: 0;
-	flex-wrap: wrap;
+	/* Hack to remove whitespace that results from using inline-block */
-	gap: 5px;
 	margin-top: calc(var(--base-line-height) / 2);
 	margin-bottom: calc(var(--base-line-height) / 2);
 }
 
-/* Float them, remove border radius, then re-add to first and last elements */
+.btn-toolbar>.btn+.btn,
-.btn-group > .btn {
+.btn-toolbar>.btn-group+.btn,
-	position: relative;
+.btn-toolbar>.btn+.btn-group {
-	border-radius: 0;
+	margin-left: 5px;
-	flex: 0 1 auto;
 }
 
-.btn-group > .btn + .btn {
+/* Float them, remove border radius, then re-add to first and last elements */
+.btn-group>.btn {
+	position: relative;
+	border-radius: 0;
+}
+
+.btn-group>.btn+.btn {
 	margin-left: -1px;
 }
 
-.btn-group > .btn,
+.btn-group>.btn,
-.btn-group > .dropdown-menu,
+.btn-group>.dropdown-menu,
-.btn-group > .popover {
+.btn-group>.popover {
 	font-size: var(--base-font-size);
+	/* redeclare as part 2 of font-size inline-block hack */
 }
 
 /* Reset fonts for other sizes */
-.btn-group > .btn-mini {
+.btn-group>.btn-mini {
 	font-size: var(--font-size-mini);
 }
 
-.btn-group > .btn-small {
+.btn-group>.btn-small {
 	font-size: var(--font-size-small);
 }
 
-.btn-group > .btn-large {
+.btn-group>.btn-large {
 	font-size: var(--font-size-large);
 }
 
 /* Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match */
-.btn-group > .btn:first-child {
+.btn-group>.btn:first-child {
 	margin-left: 0;
 	border-top-left-radius: var(--base-border-radius);
 	border-bottom-left-radius: var(--base-border-radius);
 }
 
 /* Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it */
-.btn-group > .btn:last-child,
+.btn-group>.btn:last-child,
-.btn-group > .dropdown-toggle {
+.btn-group>.dropdown-toggle {
 	border-top-right-radius: var(--base-border-radius);
 	border-bottom-right-radius: var(--base-border-radius);
 }
 
-/* Ensure proper alignment of dropdown-toggle button */
-.btn-group > .dropdown-toggle {
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-}
-
 /* Reset corners for large buttons */
-.btn-group > .btn.large:first-child {
+.btn-group>.btn.large:first-child {
 	margin-left: 0;
 	border-top-left-radius: var(--border-radius-large);
 	border-bottom-left-radius: var(--border-radius-large);
 }
 
-.btn-group > .btn.large:last-child,
+.btn-group>.btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
+.btn-group>.large.dropdown-toggle {
 	border-top-right-radius: var(--border-radius-large);
 	border-bottom-right-radius: var(--border-radius-large);
 }
 
 /* On hover/focus/active, bring the proper btn to front */
-.btn-group > .btn:hover,
+.btn-group>.btn:hover,
-.btn-group > .btn:focus,
+.btn-group>.btn:focus,
-.btn-group > .btn:active,
+.btn-group>.btn:active,
-.btn-group > .btn.active {
+.btn-group>.btn.active {
 	z-index: 2;
-	position: relative; /* Ensure z-index works properly */
 }
 
 /* On active and open, don't show outline */
@@ -104,18 +106,18 @@
 }
 
 /* Split button dropdowns */
-.btn-group > .btn + .dropdown-toggle {
+.btn-group>.btn+.dropdown-toggle {
 	padding-left: 8px;
 	padding-right: 8px;
 	box-shadow: inset 1px 0 0 rgba(255, 255, 255, .125), inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05);
 }
 
-.btn-group > .btn-mini + .dropdown-toggle {
+.btn-group>.btn-mini+.dropdown-toggle {
 	padding-left: 5px;
 	padding-right: 5px;
 }
 
-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group>.btn-large+.dropdown-toggle {
 	padding-left: 12px;
 	padding-right: 12px;
 }
@@ -156,18 +158,23 @@
 
 /* Reposition the caret */
 .btn .caret {
-	display: inline-block;
+	margin-top: 8px;
-	vertical-align: middle;
 	margin-left: 0;
 }
 
 /* Carets in other button sizes */
 .btn-large .caret {
+	margin-top: 6px;
 	border-left-width: 5px;
 	border-right-width: 5px;
 	border-top-width: 5px;
 }
 
+.btn-mini .caret,
+.btn-small .caret {
+	margin-top: 8px;
+}
+
 /* Upside down carets for .dropup */
 .dropup .btn-large .caret {
 	border-bottom-width: 5px;
@@ -186,33 +193,33 @@
 
 /* Vertical button groups */
 .btn-group-vertical {
-	display: inline-flex;
+	display: inline-block;
-	flex-direction: column;
 }
 
-.btn-group-vertical > .btn {
+.btn-group-vertical>.btn {
-	width: 100%;
+	display: block;
+	float: none;
 	max-width: 100%;
 	border-radius: 0;
 }
 
-.btn-group-vertical > .btn + .btn {
+.btn-group-vertical>.btn+.btn {
 	margin-left: 0;
 	margin-top: -1px;
 }
 
-.btn-group-vertical > .btn:first-child {
+.btn-group-vertical>.btn:first-child {
 	border-radius: var(--base-border-radius) var(--base-border-radius) 0 0;
 }
 
-.btn-group-vertical > .btn:last-child {
+.btn-group-vertical>.btn:last-child {
 	border-radius: 0 0 var(--base-border-radius) var(--base-border-radius);
 }
 
-.btn-group-vertical > .btn-large:first-child {
+.btn-group-vertical>.btn-large:first-child {
 	border-radius: var(--border-radius-large) var(--border-radius-large) 0 0;
 }
 
-.btn-group-vertical > .btn-large:last-child {
+.btn-group-vertical>.btn-large:last-child {
 	border-radius: 0 0 var(--border-radius-large) var(--border-radius-large);
 }

css/buttons.css

@@ -5,19 +5,20 @@
 
 /* Core */
 .btn {
-	display: inline-flex;
+	display: inline-block;
-	align-items: center;
-	justify-content: center;
 	padding: 4px 12px;
 	margin-bottom: 0;
+	/* For input.btn */
 	font-size: var(--base-font-size);
 	line-height: var(--base-line-height);
 	text-align: center;
+	vertical-align: middle;
 	cursor: pointer;
 	background-color: var(--btn-background);
 	background-image: linear-gradient(to bottom, var(--btn-background), var(--btn-background-highlight));
 	border: 1px solid var(--btn-border);
 	border-bottom-color: #b3b3b3;
+	/* darken(--btn-border, 10%) */
 	border-radius: var(--base-border-radius);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05);
 }
@@ -27,39 +28,8 @@
 .btn:focus {
 	color: var(--gray-dark);
 	text-decoration: none;
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-background) 80%, black), color-mix(in srgb, var(--btn-background-highlight) 80%, black));
+	background-position: 0 -15px;
-	transition: background-image 0.2s ease;
+	transition: background-position 0.1s linear;
-}
-
-/* Specific hover states for colored buttons */
-.btn-primary:hover, .btn-primary:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-primary-background) 80%, black), color-mix(in srgb, var(--btn-primary-background-highlight) 80%, black));
-}
-
-.btn-warning:hover, .btn-warning:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-warning-background) 80%, black), color-mix(in srgb, var(--btn-warning-background-highlight) 80%, black));
-}
-
-.btn-danger:hover, .btn-danger:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-danger-background) 80%, black), color-mix(in srgb, var(--btn-danger-background-highlight) 80%, black));
-}
-
-.btn-success:hover, .btn-success:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-success-background) 80%, black), color-mix(in srgb, var(--btn-success-background-highlight) 80%, black));
-}
-
-.btn-info:hover, .btn-info:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-info-background) 80%, black), color-mix(in srgb, var(--btn-info-background-highlight) 80%, black));
-}
-
-.btn-inverse:hover, .btn-inverse:focus {
-	color: var(--white);
-	background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-inverse-background) 80%, black), color-mix(in srgb, var(--btn-inverse-background-highlight) 80%, black));
 }
 
 /* Focus state for keyboard and accessibility */
@@ -84,7 +54,6 @@
 	background-image: none;
 	opacity: 0.65;
 	box-shadow: none;
-	pointer-events: none;
 }
 
 /* Button Sizes */
@@ -125,7 +94,7 @@
 
 /* Block button */
 .btn-block {
-	display: flex;
+	display: block;
 	width: 100%;
 	padding-left: 0;
 	padding-right: 0;
@@ -133,7 +102,7 @@
 }
 
 /* Vertically space out multiple block buttons */
-.btn-block + .btn-block {
+.btn-block+.btn-block {
 	margin-top: 5px;
 }
 
@@ -202,6 +171,13 @@ input[type="button"].btn-block {
 	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
 
+/* Cross-browser Jank */
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+
 /* Link buttons */
 .btn-link,
 .btn-link:active,

css/caret.css

@@ -1,22 +0,0 @@
-/*
-	Caret
-	========================================
-*/
-
-/* Define the caret appearance */
-.caret {
-	display: inline-block;
-	width: 0;
-	height: 0;
-	vertical-align: middle;
-	border-top: 4px solid;
-	border-right: 4px solid transparent;
-	border-left: 4px solid transparent;
-	content: "";
-}
-
-/* Upside down caret for dropup */
-.dropup .caret {
-	border-top: 0;
-	border-bottom: 4px solid;
-}

css/tests/buttons.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-
+  <head>
-<head>
     <meta charset="utf-8">
     <title>Buttons &middot; Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -17,9 +16,9 @@
       }
     </style>
     <link href="../bootstrap-responsive.css" rel="stylesheet">
-</head>
+  </head>
 
-<body>
+  <body>
 
     <div class="container">
 
@@ -38,8 +37,7 @@
         </div><!-- /btn-group -->
         <div class="btn-group dropup">
           <button class="btn btn-primary">Dropup</button>
-				<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span
+          <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-						class="caret"></span></button>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -50,8 +48,7 @@
         </div><!-- /btn-group -->
         <div class="btn-group dropup">
           <button class="btn btn-danger">Dropup</button>
-				<button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span
+          <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-						class="caret"></span></button>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -62,8 +59,7 @@
         </div><!-- /btn-group -->
         <div class="btn-group dropup">
           <button class="btn btn-warning">Dropup</button>
-				<button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span
+          <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-						class="caret"></span></button>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -74,8 +70,7 @@
         </div><!-- /btn-group -->
         <div class="btn-group dropup">
           <button class="btn btn-success">Dropup</button>
-				<button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span
+          <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-						class="caret"></span></button>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -97,8 +92,7 @@
         </div><!-- /btn-group -->
         <div class="btn-group dropup">
           <button class="btn btn-inverse">Dropup</button>
-				<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
+          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-						class="caret"></span></button>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
             <li><a href="#">Another action</a></li>
@@ -112,7 +106,8 @@
 
     </div> <!-- /container -->
 
-	<!-- Le javascript ================================================== -->
+    <!-- Le javascript
+    ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="../../docs/assets/js/jquery.js"></script>
     <script src="../../docs/assets/js/bootstrap-transition.js"></script>
@@ -128,6 +123,5 @@
     <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
     <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
 
-</body>
+  </body>
-
 </html>