badge fixes, deps update

package-lock.json

@@ -2838,8 +2838,8 @@
       "dev": true
     },
     "bootstrap": {
-      "version": "github:twbs/bootstrap#4fc701f6aa8b01fb952733b8a4a0b55337760391",
-      "from": "github:twbs/bootstrap#4fc701f"
+      "version": "github:twbs/bootstrap#ed32ee2e78b4de244d54e1393ba0e4f6941a72bf",
+      "from": "github:twbs/bootstrap#ed32ee2"
     },
     "boxen": {
       "version": "4.2.0",
@@ -15756,9 +15756,9 @@
       "dev": true
     },
     "yaml": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.1.tgz",
-      "integrity": "sha512-xbWX1ayUVoW8DPM8qxOBowac4XxSTi0mFLbiokRq880ViYglN+F3nJ4Dc2GdypXpykrknKS39d8I3lzFoHv1kA==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
+      "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.9.2"

package.json

@@ -109,7 +109,7 @@
     "svgo": "^1.3.2",
     "tabler-icons": "^1.6.0",
     "terser": "^4.6.11",
-    "yaml": "^1.9.1"
+    "yaml": "^1.9.2"
   },
   "dependencies": {
     "@fullcalendar/core": "^4.4.0",
@@ -119,7 +119,7 @@
     "@fullcalendar/timegrid": "^4.4.0",
     "apexcharts": "^3.18.1",
     "autosize": "^4.0.2",
-    "bootstrap": "twbs/bootstrap#4fc701f",
+    "bootstrap": "twbs/bootstrap#ed32ee2",
     "countup.js": "^2.0.4",
     "daterangepicker": "^3.0.5",
     "flatpickr": "^4.6.3",

scss/_variables.scss

@@ -266,6 +266,7 @@ $badge-padding-y: .125rem !default;
 $badge-padding-x: .25rem !default;
 $badge-font-size: $h6-font-size !default;
 $badge-font-weight: $font-weight-bold !default;
+$badge-line-height: 1 !default;
 $badge-empty-size: .5rem !default;
 
 //buttons

scss/mixins/_mixins.scss

@@ -1,9 +1,12 @@
-@mixin subheader($include-color: true) {
+@mixin subheader($include-color: true, $include-line-height: true) {
   font-size: $h6-font-size;
   font-weight: $font-weight-bold;
   text-transform: uppercase;
   letter-spacing: .04em;
+
+  @if $include-line-height {
     line-height: $h6-line-height;
+  }
 
   @if ($include-color) {
     color: $text-muted;

scss/ui/_badges.scss

@@ -1,5 +1,4 @@
 .badge {
-  @include subheader(false);
   display: inline-flex;
   justify-content: center;
   background: $gray-500;