Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 2 insertions, 27 deletions

diff --git a/vendor/twbs/bootstrap/scss/_badge.scss b/vendor/twbs/bootstrap/scss/_badge.scss
index 42c5d08d7..08df1b84a 100644
--- a/vendor/twbs/bootstrap/scss/_badge.scss
+++ b/vendor/twbs/bootstrap/scss/_badge.scss
@@ -9,17 +9,12 @@
   @include font-size($badge-font-size);
   font-weight: $badge-font-weight;
   line-height: 1;
+  color: $badge-color;
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
   @include border-radius($badge-border-radius);
-  @include transition($badge-transition);
-
-  @at-root a#{&} {
-    @include hover-focus() {
-      text-decoration: none;
-    }
-  }
+  @include gradient-bg();
 
   // Empty badges collapse automatically
   &:empty {
@@ -32,23 +27,3 @@
   position: relative;
   top: -1px;
 }
-
-// Pill badges
-//
-// Make them extra rounded with a modifier to replace v3's badges.
-
-.badge-pill {
-  padding-right: $badge-pill-padding-x;
-  padding-left: $badge-pill-padding-x;
-  @include border-radius($badge-pill-border-radius);
-}
-
-// Colors
-//
-// Contextual variations (linked badges get darker on :hover).
-
-@each $color, $value in $theme-colors {
-  .badge-#{$color} {
-    @include badge-variant($value);
-  }
-}