@gitlab/ui 83.0.0 → 84.0.0

package/dist/tokens/tokens_table.js

@@ -118,7 +118,7 @@ var ref_item = ref.item;
 var name = ref_item.name;
 var deprecated = ref_item.deprecated;
 var description = ref_item.description;
-return [_c('code',{staticClass:"gl-font-base gl-text-strong"},[_vm._v("\n        "+_vm._s(name)+"\n      ")]),_vm._v(" "),(deprecated)?_c('gl-badge',{attrs:{"size":"sm","variant":"danger"}},[_vm._v("Deprecated")]):_vm._e(),_vm._v(" "),(description)?_c('div',{staticClass:"gl-mt-3 gl-text-subtle"},[_vm._v("\n        "+_vm._s(description)+"\n      ")]):_vm._e()]}},{key:"cell(value)",fn:function(ref){
+return [_c('code',{staticClass:"gl-font-base gl-text-strong"},[_vm._v("\n        "+_vm._s(name)+"\n      ")]),_vm._v(" "),(deprecated)?_c('gl-badge',{attrs:{"variant":"danger"}},[_vm._v("Deprecated")]):_vm._e(),_vm._v(" "),(description)?_c('div',{staticClass:"gl-mt-3 gl-text-subtle"},[_vm._v("\n        "+_vm._s(description)+"\n      ")]):_vm._e()]}},{key:"cell(value)",fn:function(ref){
 var ref_item = ref.item;
 var type = ref_item.type;
 var value = ref_item.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "83.0.0",
+  "version": "84.0.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/base/badge/badge.scss

@@ -1,3 +1,6 @@
+$badge-padding-horizontal: 0.75 * $grid-size;
+$badge-min-width: 2.5 * $grid-size;
+
 @mixin gl-badge-variant(
   $variant,
   $color,
@@ -15,7 +18,6 @@
     color: $color;
 
     .gl-badge-icon {
-      color: $icon-color;
       transition: inherit;
     }
   }
@@ -66,29 +68,18 @@
 .gl-badge {
   @include gl-display-inline-flex;
   @include gl-align-items-center;
+  @include gl-justify-content-center;
   @include gl-font-sm;
   @include gl-font-weight-normal;
   @include gl-line-height-normal;
-  @include gl-py-2;
-  @include gl-px-3;
+  gap: $gl-spacing-scale-2;
+  padding: $gl-spacing-scale-1 $badge-padding-horizontal;
+  min-width: $badge-min-width;
 
   @media (forced-colors: active) {
     border: 1px solid;
   }
 
-  &.sm {
-    @include gl-py-0;
-  }
-
-  &.md {
-    @include gl-py-2;
-  }
-
-  &.lg {
-    @include gl-py-3;
-    @include gl-font-base;
-  }
-
   .gl-badge-icon {
     @include gl-h-5;
     @include gl-w-5;
@@ -193,4 +184,11 @@
 // overriding Bootstap's `.btn .badge {top: -1px}` as the badge is not vertically centered otherwise
 .gl-button .gl-badge {
   top: 0;
+  @include gl-py-0;
+  @include gl-px-2;
+}
+
+.gl-new-dropdown-contents .gl-badge,
+.gl-tab-nav-item .gl-badge {
+  @include gl-my-n1;
 }

package/src/components/base/badge/badge.vue

@@ -1,11 +1,7 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
 import { BBadge } from 'bootstrap-vue';
-import {
-  badgeSizeOptions,
-  badgeVariantOptions,
-  badgeIconSizeOptions,
-} from '../../../utils/constants';
+import { badgeVariantOptions, badgeIconSizeOptions } from '../../../utils/constants';
 import GlIcon from '../icon/icon.vue';
 
 export default {
@@ -16,17 +12,6 @@ export default {
   },
   inheritAttrs: false,
   props: {
-    /**
-     * The size of the badge.
-     */
-    size: {
-      type: String,
-      default: badgeSizeOptions.md,
-      validator(value) {
-        return badgeSizeOptions[value] !== undefined;
-      },
-      required: false,
-    },
     /**
      * The variant of the badge.
      */
@@ -61,6 +46,9 @@ export default {
       // eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots
       return Boolean(this.icon && Object.keys(this.$slots).length === 0);
     },
+    isCircularIcon() {
+      return ['issue-open-m', 'issue-close'].includes(this.icon);
+    },
     role() {
       return this.hasIconOnly ? 'img' : undefined;
     },
@@ -82,7 +70,8 @@ export default {
   <b-badge
     v-bind="$attrs"
     :variant="variant"
-    :class="['gl-badge', size]"
+    class="gl-badge"
+    :class="{ 'gl-px-2!': !$scopedSlots.default }"
     :role="role"
     :aria-label="ariaLabel"
     pill
@@ -91,7 +80,7 @@ export default {
       v-if="icon"
       class="gl-badge-icon"
       :size="iconSizeComputed"
-      :class="{ 'gl-mr-2': !hasIconOnly }"
+      :class="{ '-gl-ml-2 gl-ml-n2': isCircularIcon }"
       :name="icon"
     />
     <!-- @slot The badge content to display. -->

package/src/components/base/label/label.scss

@@ -1,5 +1,7 @@
 $label-max-width: 100%;
 $label-close-button: '.gl-label-close.gl-button';
+$label-padding-horizontal: 0.75 * $grid-size;
+$label-padding-horizontal-half: 0.375 * $grid-size;
 
 .gl-label {
   @include gl-align-items-center;
@@ -45,7 +47,7 @@ $label-close-button: '.gl-label-close.gl-button';
   .gl-label-text,
   .gl-label-text-scoped {
     @include gl-display-block;
-    padding: $gl-spacing-scale-1 #{$gl-spacing-scale-3 - $gl-spacing-scale-1};
+    padding: $gl-spacing-scale-1 $label-padding-horizontal;
     @include str-truncated($label-max-width);
   }
 
@@ -54,8 +56,8 @@ $label-close-button: '.gl-label-close.gl-button';
     @include gl-display-flex;
     width: px-to-rem(14px);
     height: px-to-rem(14px);
-    margin-left: calc(#{-$gl-spacing-scale-1} - (#{$gl-spacing-scale-1} / 2));
-    margin-right: calc(#{$gl-spacing-scale-2} - (#{$gl-spacing-scale-1} / 2));
+    margin-left: -$label-padding-horizontal-half;
+    margin-right: $label-padding-horizontal-half;
     @include gl-p-0;
     @include gl-rounded-full;
     @include gl-shadow-none;
@@ -152,7 +154,7 @@ $label-close-button: '.gl-label-close.gl-button';
   }
 
   #{$label-close-button} {
-    margin-left: #{-$gl-spacing-scale-2 - $gl-spacing-scale-1};
+    margin-left: #{-$label-padding-horizontal};
 
     &:focus,
     &:hover {
@@ -172,7 +174,7 @@ $label-close-button: '.gl-label-close.gl-button';
 
   .gl-label-text-scoped {
     @include gl-text-gray-950;
-    padding-left: #{$gl-spacing-scale-3 - $gl-spacing-scale-2};
+    padding-left: $gl-spacing-scale-2;
     padding-right: $gl-spacing-scale-3;
   }
 }

package/src/components/experimental/experiment_badge/experiment_badge.vue

@@ -80,7 +80,7 @@ export default {
 </script>
 
 <template>
-  <gl-badge :id="triggerId" class="gl-mx-4 gl-hover-cursor-pointer" variant="neutral" size="md">
+  <gl-badge :id="triggerId" class="gl-mx-4 gl-hover-cursor-pointer" variant="neutral">
     <span>{{ activeType.BADGE }}</span>
     <gl-popover
       triggers="click"

package/src/tokens/tokens_table.vue

@@ -142,7 +142,7 @@ export default {
         <code class="gl-font-base gl-text-strong">
           {{ name }}
         </code>
-        <gl-badge v-if="deprecated" size="sm" variant="danger">Deprecated</gl-badge>
+        <gl-badge v-if="deprecated" variant="danger">Deprecated</gl-badge>
         <div v-if="description" class="gl-mt-3 gl-text-subtle">
           {{ description }}
         </div>