@castlabs/ui 4.18.4 → 4.18.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@castlabs/ui",
-  "version": "4.18.4",
+  "version": "4.18.6",
   "repository": "https://github.com/castlabs/ui-styleguide",
   "private": false,
   "description": "A vanilla HTML/CS/JS & Vue.js component library for castLabs.",

package/src/components/ClBadge/style.scss

@@ -5,118 +5,29 @@
 
 // This file adds & customizes bootstrap's cards.
 
-@import 'bootstrap/scss/badge';
+@import 'style.variables';
 
-$badge-color-fg: $color-ci-white;
-$badge-color-bg: $color-dark;
-$badge-padding: px(4) px(8);
-
-@mixin cl-badge() {
-  @extend %cl-font-condensed;
-
-  background-color: $badge-color-bg;
-  border-radius: 2rem;
-  font-size: px(14); // 18->14
-  font-weight: 650;
-  line-height: 1em;
-  padding: $badge-padding;
-
-  &-primary,
-  &-secondary,
-  &-success,
-  &-danger,
-  &-warning,
-  &-info,
-  &-light,
-  &-dark {
-    background-color: $badge-color-bg;
-    color: $badge-color-fg;
-  }
-
-  &.cl-badge-text {
-    background-color: $badge-color-bg;
-  }
-
-  &.cl-badge-light {
-    background-color: $badge-color-fg;
-    color: $badge-color-bg;
-  }
-
-  &.cl-badge-primary {
-    background-color: $color-primary;
-  }
-
-  &.cl-badge-secondary {
-    background-color: $color-secondary;
+.badge, // bs badge class is deprecated
+[class^='cl-badge'],
+[class*=' cl-badge'] {
+  &:not(.cl-badge-derived) {
+    @extend %cl-badge;
   }
 }
 
-@mixin badge-derived() {
-  $badge-color: $color-ci-silver;
-
-  background-color: transparent;
-  box-shadow: 0 0 0 2px $badge-color inset;
-  color: $badge-color;
-  display: inline-block;
-  text-align: left;
-  width: 3em;
-
-  &::before {
-    @include cl-fontawesome('\f064');
-
-    color: $badge-color !important;
-    position: relative;
-    top: 0;
-    transform: scale(0.75) scaleY(-1) translate(-0.15em, -0.025em);
-  }
-
-  &.cl-badge-primary {
-    box-shadow: 0 0 0 2px $color-primary inset;
-    color: $color-primary;
-
-    &::before {
-      color: $color-primary !important;
-    }
-  }
-
-  &.cl-badge-secondary {
-    box-shadow: 0 0 0 2px $color-secondary inset;
-    color: $color-secondary;
-
-    &::before {
-      color: $color-secondary !important;
-    }
-  }
-
-  .cl-spacing-box-micro &,
-  .cl-spacing-box-tiny &,
-  .cl-spacing-box-small &,
-  .cl-spacing-box &,
-  .cl-spacing-box-medium &,
-  .cl-spacing-box-large &,
-  .cl-spacing-box-huge & {
-    margin-right: 0;
-  }
-}
-
-.badge {
-  @include cl-badge();
-
-  &.cl-badge-derived {
-    @include badge-derived();
+a[class^='cl-badge'],
+a[class*=' cl-badge'] {
+  @include typography-links($badge-color-fg, rgba($badge-color-fg, $color-hover-opacity), 0);
 
-    + .badge {
-      margin-left: -1.5em;
-    }
-  }
+  display: inline-block !important;
 }
 
-a.badge,
-.badge a {
-  @include typography-links($badge-color-fg, rgba($badge-color-fg, $color-hover-opacity), 0);
+.cl-badge-derived {
+  @extend %cl-badge-derived;
 
-  & {
-    display: inline-block;
-    padding: $badge-padding;
+  + .badge, // bs badge class is deprecated
+  + [class^='cl-badge'],
+  + [class*=' cl-badge'] {
+    margin-left: -1.66em;
   }
 }

package/src/components/ClBadge/style.variables.scss

@@ -0,0 +1,64 @@
+$badge-color-fg: $color-ci-white;
+$badge-color-bg: $color-dark;
+$badge-padding: px(4) px(8);
+$badge-min-height: 1.642857143em; // 23px @ 14pt
+$badge-baseline-shift: .055555em; // 1px @ 14pt
+
+%cl-badge {
+  @extend %cl-font-condensed;
+
+  background-color: $badge-color-bg;
+  border-radius: 2rem;
+  color: $badge-color-fg;
+  display: inline-block;
+  font-size: 0.77777778em; // 18px->14px
+  font-weight: 650;
+  line-height: 1em;
+  min-height: $badge-min-height;
+  padding: (0.2857em + $badge-baseline-shift) 0.5714em (0.2857em - $badge-baseline-shift); // 4px 8px @ 14px
+  white-space: nowrap;
+
+  &[class*='-text'],
+  &[class*='-dark'] {
+    background-color: $badge-color-bg;
+  }
+
+  &[class*='-light'] {
+    background-color: $color-ci-smoke;
+    color: $color-ci-dim;
+  }
+
+  &[class*='-primary'] {
+    background-color: $color-primary;
+  }
+
+  &[class*='-secondary'] {
+    background-color: $color-secondary;
+  }
+}
+
+%cl-badge-derived {
+  $badge-color: $color-ci-silver;
+
+  background-color: transparent;
+  border-radius: 2rem;
+  box-shadow: 0 0 0 2px $badge-color inset;
+  color: $badge-color;
+  display: inline-block;
+  font-size: 0.77777778em; // 18px->14px
+  line-height: 1em;
+  margin-right: 0 !important;
+  min-height: $badge-min-height;
+  padding: (0.2857em + $badge-baseline-shift) 0.5714em (0.2857em - $badge-baseline-shift); // 4px 8px @ 14px
+  white-space: nowrap;
+
+  &::before {
+    @include cl-fontawesome('\f064');
+
+    color: $badge-color !important;
+    position: relative;
+    top: 0;
+    transform: scale(0.75) scaleY(-1) translate(-0.4em, -0.025em);
+    width: 2em;
+  }
+}

package/src/components/ClList/style.variables.scss

@@ -8,6 +8,8 @@
 $list-indent: $spacing-small * 2.5;
 
 %cl-list {
+  position: relative;
+
   li {
     list-style-type: none;
 
@@ -17,8 +19,10 @@ $list-indent: $spacing-small * 2.5;
       & {
         color: $color-ci-silver;
         margin-left: -$list-indent;
-        position: static;
+        position: absolute;
         text-align: center;
+        top: inherit;
+        transform: translateY(0.2em);
         width: $list-indent;
       }
     }

package/src/components/text/ClHashtag/style.scss

@@ -5,27 +5,32 @@
 
 // This file defines custom hashtag styles.
 
-.cl-hashtag {
-  @include cl-badge();
+[class^='cl-hashtag'],
+[class*=' cl-hashtag'] {
+  &:not(.cl-hashtag-derived) {
+    @extend %cl-badge;
 
-  & {
-    color: $badge-color-fg;
-  }
-
-  &::before {
-    @include cl-fontawesome('\f292');
+    &::before {
+      @include cl-fontawesome('\f292');
 
-    & {
-      margin-right: $spacing-micro;
-      position: static;
+      margin-right: 0.2em;
+      top: 0.015em;
     }
   }
+}
 
-  &.cl-hashtag-secondary {
-    background-color: $color-secondary;
-  }
+a[class^='cl-hashtag'],
+a[class*=' cl-hashtag'] {
+  @include typography-links($badge-color-fg, rgba($badge-color-fg, $color-hover-opacity), 0);
+
+  display: inline-block !important;
+}
+
+.cl-hashtag-derived {
+  @extend %cl-badge-derived;
 
-  .cl-p-large & {
-    font-weight: 500;
+  + [class^='cl-hashtag'],
+  + [class*=' cl-hashtag'] {
+    margin-left: -1.66em;
   }
 }

package/src/components/text/ClPlan/style.scss

@@ -5,31 +5,32 @@
 
 // This file defines custom plan styles.
 
-.cl-plan {
-  @include cl-badge();
+[class^='cl-plan'],
+[class*=' cl-plan'] {
+  &:not(.cl-plan-derived) {
+    @extend %cl-badge;
 
-  & {
-    color: $badge-color-fg;
-  }
-
-  &::before {
-    @include cl-fontawesome('\f005');
+    &::before {
+      @include cl-fontawesome('\f005');
 
-    & {
-      margin-right: $spacing-micro;
-      position: static;
+      margin-right: 0.2em;
+      top: -0.04em;
     }
   }
+}
 
-  .cl-p-large & {
-    font-weight: 500;
-  }
+a[class^='cl-plan'],
+a[class*=' cl-plan'] {
+  @include typography-links($badge-color-fg, rgba($badge-color-fg, $color-hover-opacity), 0);
+
+  display: inline-block !important;
 }
 
-.cl-badge-derived {
-  @include badge-derived();
+.cl-plan-derived {
+  @extend %cl-badge-derived;
 
-  + .cl-plan {
-    margin-left: -1.5em;
+  + [class^='cl-plan'],
+  + [class*=' cl-plan'] {
+    margin-left: -1.66em;
   }
 }

package/src/components/text/ClRole/style.scss

@@ -5,35 +5,32 @@
 
 // This file defines custom role styles.
 
-.cl-role {
-  @include cl-badge();
+[class^='cl-role'],
+[class*=' cl-role'] {
+  &:not(.cl-role-derived) {
+    @extend %cl-badge;
 
-  & {
-    color: $badge-color-fg;
-  }
-
-  &::before {
-    @include cl-fontawesome('\f02b');
+    &::before {
+      @include cl-fontawesome('\f02b');
 
-    & {
-      margin-right: $spacing-micro;
-      position: static;
+      margin-right: 0.2em;
+      top: .05em;
     }
   }
+}
 
-  &.cl-role-primary {
-    background-color: $color-primary;
-  }
+a[class^='cl-role'],
+a[class*=' cl-role'] {
+  @include typography-links($badge-color-fg, rgba($badge-color-fg, $color-hover-opacity), 0);
 
-  .cl-p-large & {
-    font-weight: 500;
-  }
+  display: inline-block !important;
 }
 
-.cl-badge-derived {
-  @include badge-derived();
+.cl-role-derived {
+  @extend %cl-badge-derived;
 
-  + .cl-role {
-    margin-left: -1.5em;
+  + [class^='cl-role'],
+  + [class*=' cl-role'] {
+    margin-left: -1.66em;
   }
 }