@itwin/itwinui-css 0.39.1 → 0.42.0

package/css/tile.css

@@ -32,57 +32,65 @@
     border-bottom:1px solid var(--iui-color-background-4); }
     .iui-tile .iui-thumbnail > .iui-type-indicator,
     .iui-tile .iui-thumbnail > .iui-quick-action{
-      background-color:transparent;
       border-color:transparent;
+      background-color:transparent;
       padding:0 8px;
+      height:38px;
+      gap:8px;
+      padding:0 2px;
+      height:27px;
+      gap:4px;
       position:absolute;
       border-radius:50%;
       top:6px; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator.iui-small,
-      .iui-tile .iui-thumbnail > .iui-quick-action.iui-small{
-        padding:0 2px; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator.iui-large,
-      .iui-tile .iui-thumbnail > .iui-quick-action.iui-large{
-        padding:0 12px; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator > .iui-icon:only-child,
-      .iui-tile .iui-thumbnail > .iui-quick-action > .iui-icon:only-child{
+      .iui-tile .iui-thumbnail > .iui-type-indicator > .iui-button-icon:only-child,
+      .iui-tile .iui-thumbnail > .iui-quick-action > .iui-button-icon:only-child{
         margin-left:3px;
         margin-right:3px; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator:enabled:hover, .iui-tile .iui-thumbnail > .iui-type-indicator:enabled:active, .iui-tile .iui-thumbnail > .iui-type-indicator:focus-visible,
-      .iui-tile .iui-thumbnail > .iui-quick-action:enabled:hover,
-      .iui-tile .iui-thumbnail > .iui-quick-action:enabled:active,
-      .iui-tile .iui-thumbnail > .iui-quick-action:focus-visible{
+      .iui-tile .iui-thumbnail > .iui-type-indicator:focus,
+      .iui-tile .iui-thumbnail > .iui-quick-action:focus{
+        background-color:rgba(0, 0, 0, 0.1);
+        border-color:transparent;
+        background-color:rgba(var(--iui-color-foreground-body-rgb), var(--iui-opacity-6));
+        border-color:transparent; }
+        .iui-tile .iui-thumbnail > .iui-type-indicator:focus:where(:not(:focus-visible)),
+        .iui-tile .iui-thumbnail > .iui-quick-action:focus:where(:not(:focus-visible)){
+          border-color:transparent;
+          background-color:transparent; }
+          .iui-tile .iui-thumbnail > .iui-type-indicator:focus:where(:not(:focus-visible)) > .iui-button-icon:only-child,
+          .iui-tile .iui-thumbnail > .iui-quick-action:focus:where(:not(:focus-visible)) > .iui-button-icon:only-child{
+            margin-left:3px;
+            margin-right:3px; }
+      .iui-tile .iui-thumbnail > .iui-type-indicator:hover,
+      .iui-tile .iui-thumbnail > .iui-quick-action:hover{
         background-color:rgba(0, 0, 0, 0.1);
         border-color:transparent;
         background-color:rgba(var(--iui-color-foreground-body-rgb), var(--iui-opacity-6));
         border-color:transparent; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled, .iui-tile .iui-thumbnail > .iui-type-indicator.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled:hover, .iui-tile .iui-thumbnail > .iui-type-indicator.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled:active,
-      .iui-tile .iui-thumbnail > .iui-quick-action.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled,
-      .iui-tile .iui-thumbnail > .iui-quick-action.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled:hover,
-      .iui-tile .iui-thumbnail > .iui-quick-action.iui-active:not(.iui-high-visibility):not(.iui-cta):enabled:active{
-        background:transparent;
+      .iui-tile .iui-thumbnail > .iui-type-indicator.iui-active,
+      .iui-tile .iui-thumbnail > .iui-quick-action.iui-active{
         background-color:rgba(0, 139, 225, 0.1);
+        color:#008BE1;
         background-color:rgba(var(--iui-color-foreground-primary-rgb), var(--iui-opacity-6));
+        color:var(--iui-color-foreground-primary);
         border-color:transparent; }
-      .iui-tile .iui-thumbnail > .iui-type-indicator[disabled], .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:hover, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:active, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:focus,
+      .iui-tile .iui-thumbnail > .iui-type-indicator[disabled], .iui-tile .iui-thumbnail > .iui-type-indicator:disabled,
       .iui-tile .iui-thumbnail > .iui-quick-action[disabled],
-      .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:hover,
-      .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:active,
-      .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:focus{
+      .iui-tile .iui-thumbnail > .iui-quick-action:disabled{
+        cursor:not-allowed;
+        background:#EEF0F3;
+        border-color:#EEF0F3;
+        color:rgba(0, 0, 0, 0.2);
+        background:var(--iui-color-background-disabled);
+        border-color:var(--iui-color-background-disabled);
+        color:rgba(var(--iui-color-foreground-body-rgb), var(--iui-opacity-5));
+        background-color:transparent;
+        border-color:transparent;
         background-color:transparent;
         border-color:transparent; }
-        .iui-tile .iui-thumbnail > .iui-type-indicator[disabled] > .iui-icon, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:hover > .iui-icon, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:active > .iui-icon, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:focus > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled] > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:hover > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:active > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:focus > .iui-icon{
-          fill:rgba(0, 0, 0, 0.2);
-          fill:var(--iui-icons-color-actionable-disabled); }
-        .iui-tile .iui-thumbnail > .iui-type-indicator[disabled].iui-active, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:hover.iui-active, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:active.iui-active, .iui-tile .iui-thumbnail > .iui-type-indicator[disabled]:focus.iui-active,
+        .iui-tile .iui-thumbnail > .iui-type-indicator[disabled].iui-active, .iui-tile .iui-thumbnail > .iui-type-indicator:disabled.iui-active,
         .iui-tile .iui-thumbnail > .iui-quick-action[disabled].iui-active,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:hover.iui-active,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:active.iui-active,
-        .iui-tile .iui-thumbnail > .iui-quick-action[disabled]:focus.iui-active{
+        .iui-tile .iui-thumbnail > .iui-quick-action:disabled.iui-active{
           background-color:rgba(0, 0, 0, 0.05);
           background-color:rgba(var(--iui-color-foreground-body-rgb), 0.05); }
     .iui-tile .iui-thumbnail > .iui-type-indicator{
@@ -155,8 +163,8 @@
                   backdrop-filter:blur(5px);
           background-color:rgba(0, 0, 0, var(--iui-opacity-5));
           backdrop-filter:blur(5px); } }
-      .iui-tile .iui-thumbnail > .iui-picture + .iui-button:enabled > .iui-icon,
-      .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button:enabled > .iui-icon{
+      .iui-tile .iui-thumbnail > .iui-picture + .iui-button:enabled > .iui-button-icon,
+      .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button:enabled > .iui-button-icon{
         fill:#FFF;
         filter:drop-shadow(0 2px 1px rgba(0, 0, 0, 0.2));
         fill:var(--iui-color-foreground-accessory);
@@ -168,11 +176,11 @@
       .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:active{
         background-color:rgba(0, 0, 0, 0.4);
         background-color:rgba(0, 0, 0, var(--iui-opacity-4)); }
-        .iui-tile .iui-thumbnail > .iui-picture + .iui-button:hover > .iui-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:enabled > .iui-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:enabled:hover > .iui-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:active > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button:hover > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:enabled > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:enabled:hover > .iui-icon,
-        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:active > .iui-icon{
+        .iui-tile .iui-thumbnail > .iui-picture + .iui-button:hover .iui-button-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:enabled .iui-button-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:enabled:hover .iui-button-icon, .iui-tile .iui-thumbnail > .iui-picture + .iui-button.iui-active:active .iui-button-icon,
+        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button:hover .iui-button-icon,
+        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:enabled .iui-button-icon,
+        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:enabled:hover .iui-button-icon,
+        .iui-tile .iui-thumbnail > .iui-picture + .iui-button + .iui-button.iui-active:active .iui-button-icon{
           fill:#FFF;
           fill:var(--iui-color-foreground-accessory); }
   .iui-tile > .iui-content{
@@ -275,6 +283,9 @@
         overflow:hidden;
         text-overflow:ellipsis; }
     .iui-tile > .iui-content > .iui-more-options{
+      padding:0 2px;
+      height:27px;
+      gap:4px;
       position:absolute;
       bottom:5.5px;
       right:8px;

package/css/tree.css

@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+.iui-tree{
+  margin:0;
+  padding:0;
+  border:none;
+  vertical-align:baseline;
+  list-style:none; }
+
+.iui-sub-tree{
+  margin:0;
+  padding:0;
+  border:none;
+  vertical-align:baseline;
+  list-style:none; }
+
+.iui-tree-node{
+  display:flex;
+  cursor:pointer;
+  padding:0 8px; }
+  .iui-tree-node-checkbox{
+    margin-right:8px; }
+  .iui-tree-node-content{
+    display:flex;
+    align-items:center;
+    box-sizing:border-box;
+    min-height:33px;
+    margin-left:calc(28px * (var(--level, 0)));
+    overflow:hidden;
+    padding-left:2px; }
+    .iui-tree-node-content-icon{
+      fill:rgba(0, 0, 0, 0.4);
+      fill:var(--iui-icons-color);
+      display:inline-flex;
+      width:16px;
+      height:16px;
+      padding:0 6px;
+      flex-shrink:0; }
+      .iui-tree-node-content-icon.iui-informational{
+        fill:#008BE1;
+        fill:var(--iui-icons-color-primary); }
+      .iui-tree-node-content-icon.iui-positive{
+        fill:#53A21A;
+        fill:var(--iui-icons-color-positive); }
+      .iui-tree-node-content-icon.iui-warning{
+        fill:#F18B12;
+        fill:var(--iui-icons-color-warning); }
+      .iui-tree-node-content-icon.iui-negative{
+        fill:#D30A0A;
+        fill:var(--iui-icons-color-negative); }
+      .iui-tree-node-content-icon:first-child{
+        margin-left:28px; }
+    @media (prefers-reduced-motion: no-preference){
+      .iui-tree-node-content-expander-icon{
+        transition:transform 0.2s ease-out; } }
+    .iui-tree-node-content-expander-icon-expanded{
+      transform:rotate(90deg); }
+    .iui-tree-node-content-label{
+      min-width:0;
+      padding-left:6px; }
+      .iui-tree-node-content-label:first-child{
+        margin-left:28px; }
+    .iui-tree-node-content-title, .iui-tree-node-content-caption{
+      white-space:nowrap;
+      overflow:hidden;
+      text-overflow:ellipsis; }
+    .iui-tree-node-content-title{
+      font-size:14px; }
+    .iui-tree-node-content-caption{
+      font-size:12px;
+      color:rgba(0, 0, 0, 0.4);
+      color:var(--iui-text-color-muted); }
+  .iui-tree-node:focus{
+    outline:thin solid rgba(0, 139, 225, 0.4);
+    outline-offset:-1px;
+    outline:thin solid rgba(var(--iui-color-foreground-primary-rgb), var(--iui-opacity-4));
+    outline-offset:-1px; }
+  .iui-tree-node:focus:not(:focus-visible){
+    outline-offset:-2px; }
+  .iui-tree-node:hover{
+    background-color:rgba(0, 139, 225, 0.1);
+    background-color:rgba(var(--iui-color-foreground-primary-rgb), var(--iui-opacity-6)); }
+    .iui-tree-node:hover .iui-tree-node-content-caption{
+      color:#000;
+      color:var(--iui-color-foreground-body);
+      transition:color 0.2s ease; }
+  .iui-tree-node.iui-active{
+    background-color:rgba(0, 139, 225, 0.2);
+    outline:thin solid var(--iui-color-foreground-primary);
+    outline-offset:-1px;
+    background-color:rgba(var(--iui-color-foreground-primary-rgb), var(--iui-opacity-5));
+    outline:thin solid var(--iui-color-foreground-primary);
+    outline-offset:-1px; }
+    .iui-tree-node.iui-active:focus{
+      outline-width:2px;
+      outline-offset:-2px; }
+  .iui-tree-node.iui-disabled{
+    cursor:not-allowed;
+    outline:none;
+    background-color:transparent;
+    color:rgba(0, 0, 0, 0.2);
+    color:var(--iui-text-color-placeholder); }
+    .iui-tree-node.iui-disabled .iui-tree-node-content-caption{
+      color:rgba(0, 0, 0, 0.2);
+      color:var(--iui-text-color-placeholder); }

package/css/user-icon.css

@@ -65,7 +65,9 @@
     width:100%;
     height:100%;
     border-width:0;
-    border-radius:50%; }
+    border-radius:50%;
+    background-color:#FFF;
+    background-color:var(--iui-color-background-1); }
   .iui-user-icon > .iui-status{
     display:flex;
     align-items:center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/itwinui-css",
-  "version": "0.39.1",
+  "version": "0.42.0",
   "author": "Bentley Systems",
   "license": "MIT",
   "main": "src/index.scss",

package/scss/breadcrumbs/breadcrumbs.scss

@@ -35,7 +35,7 @@
   }
 
   > *,
-  .iui-label {
+  .iui-button-label {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;

package/scss/button/borderless.scss

@@ -2,59 +2,40 @@
 // See LICENSE.md in the project root for license terms and full copyright notice.
 @import '../style/index';
 @import './button';
+@import './disabled';
+@import './button-icon';
 
 @mixin iui-button-borderless {
-  background-color: transparent;
-  border-color: transparent;
-  padding: 0 $iui-s;
+  @include iui-button-borderless-base;
+  @include iui-button-size(medium, borderless);
 
-  // Sizes
-  &.iui-small {
-    padding: 0 $iui-xxs;
-  }
+  &:focus {
+    @include iui-button-borderless-hover-focus;
 
-  &.iui-large {
-    padding: 0 $iui-sm;
+    &:where(:not(:focus-visible)) {
+      @include iui-button-borderless-base;
+    }
   }
 
-  // If icon is by itself, button takes 1:1 size ratio
-  > .iui-icon:only-child {
-    margin-left: $iui-component-offset;
-    margin-right: $iui-component-offset;
+  &:hover {
+    @include iui-button-borderless-hover-focus;
   }
 
-  &:enabled:hover,
-  &:enabled:active,
-  &:focus-visible {
+  &.iui-active {
     @include themed {
-      background-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-6));
-      border-color: transparent;
-    }
-  }
-
-  &.iui-active:not(.iui-high-visibility):not(.iui-cta) {
-    &:enabled,
-    &:enabled:hover,
-    &:enabled:active {
-      background: transparent;
-      @include themed {
-        background-color: rgba(t(iui-color-foreground-primary-rgb), t(iui-opacity-6));
-      }
-      border-color: transparent;
+      background-color: rgba(t(iui-color-foreground-primary-rgb), t(iui-opacity-6));
+      color: t(iui-color-foreground-primary);
     }
+    border-color: transparent;
   }
 
   &[disabled],
-  &[disabled]:hover,
-  &[disabled]:active,
-  &[disabled]:focus {
-    background-color: transparent;
-    border-color: transparent;
+  &:disabled {
+    @include iui-button-disabled;
 
-    > .iui-icon {
-      @include themed {
-        fill: t(iui-icons-color-actionable-disabled);
-      }
+    @include themed {
+      background-color: transparent;
+      border-color: transparent;
     }
 
     &.iui-active {
@@ -64,3 +45,20 @@
     }
   }
 }
+
+@mixin iui-button-borderless-hover-focus {
+  @include themed {
+    background-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-6));
+    border-color: transparent;
+  }
+}
+
+@mixin iui-button-borderless-base {
+  border-color: transparent;
+  background-color: transparent;
+
+  > .iui-button-icon:only-child {
+    margin-left: $iui-component-offset;
+    margin-right: $iui-component-offset;
+  }
+}

package/scss/button/button-group.scss

@@ -5,72 +5,79 @@
 @mixin iui-button-group {
   display: inline-flex;
   align-items: center;
+  isolation: isolate;
 
-  > .iui-button {
-    &:not(.iui-borderless) {
-      border-radius: 0;
-    }
-
-    &:first-of-type:not(.iui-borderless) {
-      border-top-left-radius: $iui-border-radius;
-      border-bottom-left-radius: $iui-border-radius;
-    }
+  $childSelector: 'input, button'; // target nested inputs and buttons
 
-    &:last-of-type:not(.iui-borderless) {
-      border-top-right-radius: $iui-border-radius;
-      border-bottom-right-radius: $iui-border-radius;
-    }
+  > * {
+    #{$childSelector} {
+      &:hover,
+      &:focus,
+      &:focus-within {
+        position: relative;
+        z-index: 1;
+      }
 
-    &:not(.iui-borderless):not(.iui-cta):not(.iui-high-visibility):not(:last-of-type) {
-      border-right: none;
-    }
+      &:disabled {
+        position: relative;
+        z-index: -1;
+      }
 
-    &:not(.iui-high-visibility):not(.iui-cta):not(.iui-borderless) {
-      // Border trick for grouped default & disabled buttons
-      &:enabled {
-        + :disabled {
+      // Adds stripe above active button
+      &.iui-active {
+        &::after {
+          content: '';
+          position: absolute;
+          height: $iui-xxs;
+          opacity: 1;
+          top: $iui-xxs;
+          left: $iui-xxs;
+          width: calc(100% - #{$iui-xs});
           @include themed {
-            border-left-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-4));
+            background-color: t(iui-color-foreground-primary);
           }
         }
 
-        &:hover + .iui-button,
-        &:active + .iui-button,
-        &:focus-visible + .iui-button {
-          @include themed {
-            border-left-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-1));
+        &:disabled {
+          &::after {
+            @include themed {
+              background-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-5));
+            }
           }
         }
       }
 
-      // Border between 2 side-by-side disabled buttons
-      &:disabled + .iui-button:disabled {
-        @include themed {
-          border-left-color: t(iui-color-background-4);
-        }
+      // Reset border radius only for non-borderless items
+      &:not(.iui-borderless) {
+        border-radius: 0;
       }
     }
-  }
 
-  // Adds stripe above active button
-  > .iui-active {
-    &::after {
-      content: '';
-      position: absolute;
-      height: $iui-xxs;
-      opacity: 1;
-      top: $iui-xxs;
-      left: $iui-xxs;
-      width: calc(100% - #{$iui-xs});
-      @include themed {
-        background-color: t(iui-color-foreground-primary);
+    // Add rounded corners to first and last items
+    &:first-child {
+      #{$childSelector}:not(.iui-borderless) {
+        border-top-left-radius: $iui-border-radius;
+        border-bottom-left-radius: $iui-border-radius;
       }
     }
 
-    &:disabled {
-      &::after {
+    &:last-child {
+      #{$childSelector}:not(.iui-borderless) {
+        border-top-right-radius: $iui-border-radius;
+        border-bottom-right-radius: $iui-border-radius;
+      }
+    }
+
+    // Use negative margin to make adjacent borders overlap
+    &:not(:last-child) {
+      margin-right: -1px;
+    }
+
+    // Add slight border between disabled items
+    &:not(:first-child) {
+      .iui-default:disabled {
         @include themed {
-          background-color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-5));
+          border-left-color: t(iui-color-background-4);
         }
       }
     }

package/scss/button/button-icon.scss

@@ -0,0 +1,12 @@
+// Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+// See LICENSE.md in the project root for license terms and full copyright notice.
+@import '../style/index';
+@import '../icon/index';
+
+/// Mixin for button icons
+@mixin iui-button-icon {
+  width: $iui-icons-default;
+  height: $iui-icons-default;
+  transition: fill $iui-speed-fast ease-out;
+  fill: currentColor;
+}

package/scss/button/button.scss

@@ -2,6 +2,8 @@
 // See LICENSE.md in the project root for license terms and full copyright notice.
 @import '../style/index';
 @import '../icon/index';
+@import './disabled';
+@import './button-icon';
 
 $iui-button-padding: $iui-xs * 4;
 $iui-button-padding-small: $iui-xs * 2;
@@ -32,52 +34,45 @@ $iui-button-padding-large: $iui-xs * 6;
       border-color $iui-speed-fast ease-out;
   }
 
-  > .iui-icon:not(.iui-user-icon) {
-    width: $iui-icons-default;
-    height: $iui-icons-default;
-    @media (prefers-reduced-motion: no-preference) {
-      transition: fill $iui-speed-fast ease-out;
-    }
+  @include themed {
+    color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-2));
   }
 
-  &:enabled:hover {
+  &:hover {
     text-decoration: none;
+    @include themed {
+      color: rgba(t(iui-color-foreground-body-rgb), t(iui-opacity-1));
+    }
   }
 
   @include iui-focus;
-  @include iui-button-sizes;
-}
 
-@mixin iui-button-sizes {
-  padding: 0 $iui-button-padding;
-  height: $iui-component-height;
+  &[disabled],
+  &:disabled {
+    @include iui-button-disabled;
+  }
+}
 
-  > .iui-icon + .iui-label,
-  > .iui-label + .iui-icon,
-  > .iui-icon + .iui-icon {
-    margin-left: $iui-s;
+/// Mixin for applying padding and margins to various button sizes.
+/// @arg size - must be one of: small, medium, large
+/// @arg styleType - must be one of: default, borderless
+@mixin iui-button-size($size: medium, $styleType: default) {
+  @if $size == medium {
+    padding: if($styleType == 'borderless', 0 $iui-s, 0 $iui-button-padding);
+    height: $iui-component-height;
+    gap: $iui-s;
   }
 
-  &.iui-small {
-    padding: 0 $iui-button-padding-small;
+  @if $size == small {
+    padding: if($styleType == 'borderless', 0 $iui-xxs, 0 $iui-button-padding-small);
     height: $iui-component-height-small;
-
-    > .iui-icon + .iui-label,
-    > .iui-label + .iui-icon,
-    > .iui-icon + .iui-icon {
-      margin-left: $iui-xs;
-    }
+    gap: $iui-xs;
   }
 
-  &.iui-large {
-    padding: 0 $iui-button-padding-large;
+  @if $size == large {
+    padding: if($styleType == 'borderless', 0 $iui-sm, 0 $iui-button-padding-large);
     height: $iui-component-height-large;
     font-size: $iui-font-size-leading;
-
-    > .iui-icon + .iui-label,
-    > .iui-label + .iui-icon,
-    > .iui-icon + .iui-icon {
-      margin-left: $iui-sm;
-    }
+    gap: $iui-sm;
   }
 }

package/scss/button/classes.scss

@@ -4,7 +4,11 @@
 
 .iui-button {
   @include iui-button;
-  @include iui-button-default;
+  @include iui-button-size;
+
+  &.iui-default {
+    @include iui-button-default;
+  }
 
   &.iui-high-visibility {
     @include iui-button-high-visibility;
@@ -22,8 +26,22 @@
     @include iui-button-borderless;
   }
 
-  &[disabled] {
-    @include iui-button-disabled;
+  @include iui-button-size(medium);
+
+  &.iui-small {
+    @include iui-button-size(small);
+
+    &.iui-borderless {
+      @include iui-button-size(small, borderless);
+    }
+  }
+
+  &.iui-large {
+    @include iui-button-size(large);
+
+    &.iui-borderless {
+      @include iui-button-size(large, borderless);
+    }
   }
 }
 
@@ -35,3 +53,7 @@
   @include iui-button-group;
   @include iui-button-split-menu;
 }
+
+.iui-button-icon {
+  @include iui-button-icon;
+}