@gitlab/ui 117.0.2 → 118.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "117.0.2",
+  "version": "118.0.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -70,7 +70,7 @@
   "dependencies": {
     "@floating-ui/dom": "1.7.3",
     "echarts": "^5.6.0",
-    "gridstack": "^12.2.2",
+    "gridstack": "^12.3.0",
     "iframe-resizer": "^4.4.5",
     "lodash": "^4.17.21",
     "popper.js": "^1.16.1",

package/src/components/base/breadcrumb/breadcrumb.scss

@@ -49,10 +49,8 @@ $breadcrumb-max-width: $grid-size * 16;
     }
   }
 
-  @if $feature-button-border {
-    .gl-new-dropdown-icon-only.gl-button.btn-icon {
-      min-height: auto;
-    }
+  .gl-new-dropdown-icon-only.gl-button.btn-icon {
+    min-height: auto;
   }
 }
 

package/src/components/base/button/button.scss

@@ -1,22 +1,6 @@
 /*
  * Button-specific utilities
  */
-@mixin gl-button-border($color) {
-  box-shadow: inset 0 0 0 $gl-border-size-1 $color;
-}
-
-@mixin gl-button-hover-border($color) {
-  box-shadow: inset 0 0 0 $gl-border-size-2 $color;
-}
-
-@mixin gl-button-selected-border($color, $focus-ring: null) {
-  @if $focus-ring {
-    box-shadow: inset 0 0 0 $gl-border-size-2 $color, $focus-ring;
-  } @else {
-    box-shadow: inset 0 0 0 $gl-border-size-2 $color;
-  }
-}
-
 @mixin gl-button-theme(
   $color: null,
   $background-color: null,
@@ -33,11 +17,7 @@
 ) {
   color: $color;
   background-color: $background-color;
-  @if $feature-button-border {
-    border-color: $border-color;
-  } @else {
-    @include gl-button-border($border-color);
-  }
+  border-color: $border-color;
 
   &::before {
     background-color: $border-color;
@@ -48,42 +28,24 @@
   &:hover {
     color: $hover-color;
     background-color: $hover-background-color;
-    @if $feature-button-border {
-      border-color: $hover-border-color;
-    } @else {
-      @include gl-button-hover-border($hover-border-color);
-    }
+    border-color: $hover-border-color;
   }
 
   &:focus {
     color: $focus-color;
     background-color: $focus-background-color;
-    @if $feature-button-border {
-      border-color: $focus-border-color;
-    } @else {
-      @include gl-focus($color: $focus-border-color);
-    }
+    border-color: $focus-border-color;
   }
 
   &:active,
   &.active {
     color: $active-color;
     background-color: $active-background-color;
-    @if $feature-button-border {
-      border-color: $active-border-color;
-    } @else {
-      @include gl-focus($color: $focus-border-color);
-    }
+    border-color: $active-border-color;
 
-    @if $feature-button-border {
-      :focus,
-      &:focus:active {
-        @apply gl-focus;
-      }
-    } @else {
-      &:focus {
-        @include gl-focus($color: $active-border-color);
-      }
+    :focus,
+    &:focus:active {
+      @apply gl-focus;
     }
   }
 }
@@ -112,32 +74,20 @@
   @apply gl-items-center;
   @apply gl-text-base;
 
-  @if $feature-button-border {
-    @apply gl-py-0;
-    border: $gl-border-size-1 solid var(--gl-button-default-primary-border-color-default);
-    min-height: $gl-button-medium-size;
-    min-width: $gl-button-medium-size;
-    transition: color $gl-transition-duration-medium $gl-easing-out-cubic,
-                background-color $gl-transition-duration-medium $gl-easing-out-cubic,
-                border-color $gl-transition-duration-medium $gl-easing-out-cubic,
-                box-shadow $gl-transition-duration-medium $gl-easing-out-cubic,
-                text-decoration-color $gl-transition-duration-medium $gl-easing-out-cubic;
-    @include gl-prefers-reduced-motion-transition;
-  } @else {
-    @apply gl-border-0;
-    @apply gl-py-3;
-    @include gl-button-border(var(--gl-button-default-primary-border-color-default));
-  }
+  @apply gl-py-0;
+  border: $gl-border-size-1 solid var(--gl-button-default-primary-border-color-default);
+  min-height: $gl-button-medium-size;
+  min-width: $gl-button-medium-size;
+  transition: color $gl-transition-duration-medium $gl-easing-out-cubic,
+              background-color $gl-transition-duration-medium $gl-easing-out-cubic,
+              border-color $gl-transition-duration-medium $gl-easing-out-cubic,
+              box-shadow $gl-transition-duration-medium $gl-easing-out-cubic,
+              text-decoration-color $gl-transition-duration-medium $gl-easing-out-cubic;
+  @include gl-prefers-reduced-motion-transition;
 
-  @if $feature-button-border {
-    &:focus,
-    &:focus:active {
-      @apply gl-focus;
-    }
-  } @else {
-    @media (forced-colors: active) {
-      border: 1px solid;
-    }
+  &:focus,
+  &:focus:active {
+    @apply gl-focus;
   }
 
   .gl-button-text {
@@ -195,23 +145,15 @@
         background-color: var(--gl-button-selected-border-color-default);
       }
 
-      @if $feature-button-border {
-        border-width: $gl-border-size-1;
-        border-color: var(--gl-button-selected-border-color-default);
-        box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-button-selected-border-color-default);
-      } @else {
-        @include gl-button-selected-border(var(--gl-button-selected-border-color-default));
-      }
+      border-width: $gl-border-size-1;
+      border-color: var(--gl-button-selected-border-color-default);
+      box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-button-selected-border-color-default);
 
       &:hover {
         color: var(--gl-button-selected-foreground-color-hover);
         background-color: var(--gl-button-selected-background-color-hover);
-        @if $feature-button-border {
-          border-color: var(--gl-button-selected-border-color-hover);
-          box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-button-selected-border-color-hover);
-        } @else {
-          @include gl-button-selected-border(var(--gl-button-selected-border-color-hover));
-        }
+        border-color: var(--gl-button-selected-border-color-hover);
+        box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-button-selected-border-color-hover);
       }
 
       &:hover::before,
@@ -223,11 +165,7 @@
         color: var(--gl-button-selected-foreground-color-focus);
         background-color: var(--gl-button-selected-background-color-focus);
         @apply gl-focus;
-        @if $feature-button-border {
-          border-color: var(--gl-button-selected-border-color-focus);
-        } @else {
-          @include gl-button-selected-border(var(--gl-button-selected-border-color-focus), $focus-ring);
-        }
+        border-color: var(--gl-button-selected-border-color-focus);
       }
 
       &:focus::before,
@@ -240,15 +178,7 @@
         color: var(--gl-button-selected-foreground-color-active);
         background-color: var(--gl-button-selected-background-color-active);
         box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-button-selected-border-color-active);
-        @if $feature-button-border {
-          border-color: var(--gl-button-selected-border-color-active);
-        } @else {
-          @include gl-button-selected-border(var(--gl-button-selected-border-color-active), $focus-ring);
-
-          &:focus {
-            @include gl-button-selected-border(var(--gl-button-selected-border-color-active), $focus-ring);
-          }
-        }
+        border-color: var(--gl-button-selected-border-color-active);
       }
 
       &:active::before,
@@ -403,27 +333,11 @@
   &.btn-confirm,
   &.btn-danger {
     &-tertiary {
-      @if not $feature-button-border {
-        @apply gl-shadow-none;
-      }
-
       @media (forced-colors: active) {
         color: LinkText; // stylelint-disable-line scale-unlimited/declaration-strict-value
         mix-blend-mode: initial;
         border: 0;
       }
-
-      @if not $feature-button-border {
-        &:hover {
-          @apply gl-shadow-none;
-        }
-
-        &:active,
-        &:focus,
-        &:focus:active {
-          @apply gl-focus;
-        }
-      }
     }
   }
 
@@ -441,12 +355,8 @@
     @apply gl-px-3;
     @apply gl-leading-normal;
     @apply gl-text-base;
-    @if $feature-button-border {
-      min-height: $gl-button-small-size;
-      min-width: $gl-button-small-size;
-    } @else {
-      @apply gl-py-2;
-    }
+    min-height: $gl-button-small-size;
+    min-width: $gl-button-small-size;
 
     gl-emoji {
       @apply gl-text-sm;
@@ -455,81 +365,37 @@
 
   &.btn-dashed,
   &.btn-dashed-tertiary {
-    @if $feature-button-border {
-      border-style: dashed;
-      border-color: var(--gl-button-dashed-border-color-default);
-    } @else {
-      @include gl-button-border(var(--gl-button-dashed-border-color-default));
-      outline: 3px dotted var(--gl-background-color-default);
-      outline-offset: (-$gl-border-size-1);
-    }
+    border-style: dashed;
+    border-color: var(--gl-button-dashed-border-color-default);
 
     &:hover {
-      @if $feature-button-border {
-        border-color: var(--gl-button-dashed-border-color-hover);
-      } @else {
-        @include gl-button-border($color: var(--gl-button-dashed-border-color-hover));
-        outline: 3px dotted var(--gl-background-color-default);
-        outline-offset: (-$gl-border-size-1);
-      }
+      border-color: var(--gl-button-dashed-border-color-hover);
     }
 
     &:focus {
-      @if $feature-button-border {
-        border-color: var(--gl-button-dashed-border-color-focus);
-      } @else {
-        outline: 3px dotted var(--gl-background-color-default);
-        outline-offset: (-$gl-border-size-1);
-        @include gl-focus($color: var(--gl-button-dashed-border-color-focus));
-      }
+      border-color: var(--gl-button-dashed-border-color-focus);
     }
 
     &:active,
     &.active {
-      @if $feature-button-border {
-        border-color: var(--gl-button-dashed-border-color-active);
-      } @else {
-        outline: 3px dotted var(--gl-background-color-default);
-        outline-offset: (-$gl-border-size-1);
-        @include gl-focus($color: var(--gl-button-dashed-border-color-active));
-
-        &:focus {
-          outline: 3px dotted var(--gl-background-color-default);
-          outline-offset: (-$gl-border-size-1);
-          @include gl-focus($color: var(--gl-button-dashed-border-color-active));
-        }
-      }
+      border-color: var(--gl-button-dashed-border-color-active);
     }
   }
 
   &.btn-icon {
     @apply gl-leading-normal;
-    @if $feature-button-border {
-      @apply gl-p-0;
-    } @else {
-      @apply gl-p-3;
-    }
+    @apply gl-p-0;
 
     .gl-button-icon {
       @apply gl-mr-0;
     }
-
-    @if not $feature-button-border {
-      &.btn-sm {
-        @apply gl-p-2;
-      }
-    }
   }
 
   &.button-ellipsis-horizontal,
   &.button-ellipsis-horizontal.btn-sm {
     @apply gl-px-2;
-    @if $feature-button-border {
-      min-height: auto;
-      min-width: auto;
-    } @else {
-      @apply gl-py-0;
-    }
+    min-height: auto;
+    min-width: auto;
 
     svg {
       @apply gl-h-5;
@@ -553,43 +419,28 @@
     @apply gl-text-base;
     @apply gl-leading-normal;
     color: var(--gl-button-link-text-color-default);
-    @if $feature-button-border {
-      @apply gl-px-0;
-      min-height: auto;
-      min-width: auto;
-      text-decoration-thickness: auto;
-      text-decoration-style: solid;
-      text-decoration-color: transparent;
-    } @else {
-      @apply gl-py-0;
-      @apply gl-px-0;
-      @apply gl-shadow-none;
-    }
+    @apply gl-px-0;
+    min-height: auto;
+    min-width: auto;
+    text-decoration-thickness: auto;
+    text-decoration-style: solid;
+    text-decoration-color: transparent;
 
     &:hover {
       @apply gl-bg-transparent;
       color: var(--gl-button-link-text-color-hover);
-      @if $feature-button-border {
-        text-decoration-color: var(--gl-button-link-text-color-hover);
-      }
+      text-decoration-color: var(--gl-button-link-text-color-hover);
     }
 
     &:active {
       color: var(--gl-button-link-text-color-active);
-      @if $feature-button-border {
-        text-decoration-color: var(--gl-button-link-text-color-active);
-      } @else {
-        @apply gl-underline;
-      }
+      text-decoration-color: var(--gl-button-link-text-color-active);
     }
 
     &:active,
     &:focus,
     &:focus:active {
       @apply gl-bg-transparent;
-      @if not $feature-button-border {
-        @apply gl-focus;
-      }
     }
 
     &.disabled,
@@ -620,18 +471,13 @@
   &[disabled].selected {
     background-color: var(--gl-button-disabled-background-color);
     color: var(--gl-button-disabled-foreground-color);
+    border-color: var(--gl-button-disabled-border-color);
     opacity: 1;
     cursor: not-allowed !important;
 
     &::before {
       background-color: var(--gl-button-disabled-border-color);
     }
-
-    @if $feature-button-border {
-      border-color: var(--gl-button-disabled-border-color);
-    } @else {
-      @include gl-button-border(var(--gl-button-disabled-border-color));
-    }
   }
 
   &.disabled[class*='-tertiary'],

package/src/components/base/dropdown/dropdown.scss

@@ -96,21 +96,11 @@
       @include mask-chevron-down;
     }
 
-    @if $feature-button-border {
-      &.gl-button {
-        @apply gl-px-0;
-
-        &.btn-sm {
-          @apply gl-px-0;
-        }
-      }
-    } @else {
-      &.gl-button {
-        @apply gl-px-3;
+    &.gl-button {
+      @apply gl-px-0;
 
-        &.btn-sm {
-          @apply gl-px-2;
-        }
+      &.btn-sm {
+        @apply gl-px-0;
       }
     }
   }
@@ -167,10 +157,8 @@
   }
 
   .dropdown-icon-only {
-    @if $feature-button-border {
-      &.dropdown-toggle-no-caret {
-        padding: 0 !important;
-      }
+    &.dropdown-toggle-no-caret {
+      padding: 0 !important;
     }
 
     .dropdown-icon,

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

@@ -68,17 +68,14 @@ $label-padding-horizontal-half: 0.375 * $grid-size;
     @apply gl-flex;
     width: px-to-rem(14px);
     height: px-to-rem(14px);
+    min-height: auto !important;
+    min-width: auto !important;
     margin-left: -$label-padding-horizontal-half;
     margin-right: $label-padding-horizontal-half;
     @apply gl-p-0;
     @apply gl-rounded-full;
     @apply gl-shadow-none;
 
-    @if $feature-button-border {
-      min-height: auto !important;
-      min-width: auto !important;
-    }
-
     &:focus,
     &:active {
       @apply gl-focus;

package/src/components/base/search_box_by_click/search_box_by_click.scss

@@ -11,21 +11,11 @@
   .gl-search-box-by-click-history > .gl-button,
   .gl-search-box-by-click-search-button.gl-button {
     background-color: var(--gl-control-background-color-default);
-
-    @if $feature-button-border {
-      border-color: var(--gl-control-border-color-default) !important;
-    } @else {
-      box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-control-border-color-default) !important;
-    }
+    border-color: var(--gl-control-border-color-default) !important;
 
     &:disabled {
       background: var(--gl-control-background-color-disabled);
-
-      @if $feature-button-border {
-        border-color: var(--gl-control-border-color-disabled) !important;
-      } @else {
-        box-shadow: inset 0 0 0 $gl-border-size-1 var(--gl-control-border-color-disabled) !important;
-      }
+      border-color: var(--gl-control-border-color-disabled) !important;
     }
   }
 

package/src/components/base/skeleton_loader/skeleton_loader.vue

@@ -73,12 +73,17 @@ export default {
       required: false,
     },
   },
-  render(createElement, { props, slots }) {
+  render(createElement, { props, slots, data }) {
     const slotIsSet = () => slots().default;
 
     const propValueOrDefault = (name, defaultValue) =>
       props[name] !== null ? props[name] : defaultValue;
 
+    const inheritedClasses =
+      data.class || // Vue 3
+      data.attrs?.class || // Vue 2
+      '';
+
     const width = () => {
       if (slotIsSet()) {
         return propValueOrDefault('width', DEFAULT_SVG_WIDTH);
@@ -236,7 +241,8 @@ export default {
     return createElement(
       'div',
       {
-        class: 'gl-skeleton-loader-default-container gl-max-w-full',
+        staticClass: data.staticClass, // Vue 2
+        class: ['gl-skeleton-loader-default-container gl-max-w-full', inheritedClasses],
         style: {
           width: props.width !== null ? `${props.width}px` : null,
           height: props.height !== null ? `${props.height}px` : null,

package/src/scss/storybook.scss

@@ -1,7 +1,3 @@
-// Enables feature flag for GlButton border migration
-// to see in Storybook the expected new styles
-$feature-button-border: true;
-
 @import 'tokens';
 
 @import 'functions';

package/src/scss/variables.scss

@@ -337,6 +337,3 @@ $popover-arrow-color: $popover-bg;
 $popover-arrow-outer-color: $gl-border-color-default;
 
 $tooltip-opacity: 1;
-
-// Feature flag for GlButton border migration
-$feature-button-border: false !default;