From: Quy <quy@fluxbb.org>
Date: Wed, 4 Jan 2017 03:31:27 +0000 (-0800)
Subject: Drop .carete (#21525)
X-Git-Tag: v4.0.0-alpha.6~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea7e388e7d180d8251e01d0905a694a779d16d0;p=thirdparty%2Fbootstrap.git

Drop .carete (#21525)
---

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index af3c486692..584ed15137 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -128,22 +128,6 @@
 }
 
 
-// Reposition the caret
-.btn .caret {
-  margin-left: 0;
-}
-// Carets in other button sizes
-.btn-lg .caret {
-  border-width: $caret-width-lg $caret-width-lg 0;
-  border-bottom-width: 0;
-}
-// Upside down carets for .dropup
-.dropup .btn-lg .caret {
-  border-width: 0 $caret-width-lg $caret-width-lg;
-}
-
-
-
 //
 // Vertical button groups
 //
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 9638b81712..1c9c4f2352 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -152,13 +152,6 @@
 // Just add .dropup after the standard .dropdown class and you're set.
 
 .dropup {
-  // Reverse the caret
-  .caret {
-    content: "";
-    border-top: 0;
-    border-bottom: $caret-width solid;
-  }
-
   // Different positioning for bottom up menu
   .dropdown-menu {
     top: auto;
diff --git a/scss/_print.scss b/scss/_print.scss
index e77ac1dbac..e20219a38b 100644
--- a/scss/_print.scss
+++ b/scss/_print.scss
@@ -95,12 +95,6 @@
     .navbar {
       display: none;
     }
-    .btn,
-    .dropup > .btn {
-      > .caret {
-        border-top-color: #000 !important;
-      }
-    }
     .badge {
       border: $border-width solid #000;
     }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 44e4d57370..56d1c87a8b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -329,7 +329,6 @@ $component-active-color: $white !default;
 $component-active-bg:    $brand-primary !default;
 
 $caret-width:            .3em !default;
-$caret-width-lg:         $caret-width !default;
 
 $transition-base:        all .2s ease-in-out !default;
 $transition-fade:        opacity .15s linear !default;