@carbon/styles 0.9.0 → 0.11.0

package/docs/sass.md

@@ -120,23 +120,6 @@ to `false`:
 );
 ```
 
-### Emitting additional typefaces
-
-When using the font-face declarations, only `IBM Plex Sans` and `IBM Plex Mono`
-are emitted. If you would like to emit additional typefaces, like
-`IBM Plex Sans Arabic`, you can set additional config tokens:
-
-```scss
-@use '@carbon/styles/scss/config' with (
-  $css--plex-arabic: true,
-);
-```
-
-| IBM Plex Language | Token               |
-| :---------------- | :------------------ |
-| Arabic            | `$css--plex-arabic` |
-| TODO              | `TODO`              |
-
 ## Grid
 
 | Import                             | Filepath          |

package/index.scss

@@ -7,7 +7,6 @@
 
 @forward 'scss/config';
 @forward 'scss/colors' hide $white;
-@forward 'scss/font-face';
 @forward 'scss/grid';
 @forward 'scss/motion';
 @forward 'scss/type';
@@ -15,4 +14,7 @@
 @forward 'scss/theme';
 
 @use 'scss/reset';
+@forward 'scss/fonts';
+@forward 'scss/layer';
+@forward 'scss/zone';
 @use 'scss/components';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/styles",
   "description": "Styles for the Carbon Design System",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -25,13 +25,13 @@
     "@carbon/grid": "^10.39.0",
     "@carbon/layout": "^10.34.0",
     "@carbon/motion": "^10.26.0",
-    "@carbon/themes": "^10.47.0",
-    "@carbon/type": "^10.38.0",
+    "@carbon/themes": "^10.48.0",
+    "@carbon/type": "^10.39.0",
     "@ibm/plex": "6.0.0-next.6"
   },
   "devDependencies": {
     "@carbon/test-utils": "^10.20.0",
     "css": "^3.0.0"
   },
-  "gitHead": "1836ce1cac8d9a08314b62058a5ed258798901a8"
+  "gitHead": "3e014d3be20089ade76dddea87c94ab2171e6fd7"
 }

package/scss/_config.scss

@@ -5,14 +5,7 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-/// The value used to prefix selectors and CSS Custom Properties across the
-/// codebase
-/// @access public
-/// @type String
-/// @group config
-$prefix: 'cds' !default;
-
-/// If true, includes font face mixins in `_css--font-face.scss` depending on the `css--plex` feature flag
+/// If true, includes font face mixins from scss/fonts
 /// @access public
 /// @type Bool
 /// @group config
@@ -30,8 +23,22 @@ $css--reset: true !default;
 /// @group config
 $css--default-type: true !default;
 
-/// If true, include IBM Plex Arabic type
+/// Specify the default value for the `font-display` property used for fonts
+/// loaded with @font-face
 /// @access public
-/// @type Bool
+/// @type String
+/// @group config
+$font-display: 'swap' !default;
+
+/// Specify the base path for loading IBM Plex
+/// @access public
+/// @type String
+/// @group config
+$font-path: '~@ibm/plex' !default;
+
+/// The value used to prefix selectors and CSS Custom Properties across the
+/// codebase
+/// @access public
+/// @type String
 /// @group config
-$css--plex-arabic: false !default;
+$prefix: 'cds' !default;

package/scss/_layer.scss

@@ -0,0 +1,112 @@
+//
+// Copyright IBM Corp. 2021
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@use 'sass:list';
+@use 'sass:map';
+@use './config' as *;
+@use './theme';
+@use './utilities/custom-property';
+
+$-default-layer-sets: (
+  layer: (
+    theme.$layer-01,
+    theme.$layer-02,
+    theme.$layer-03,
+  ),
+  layer-active: (
+    theme.$layer-active-01,
+    theme.$layer-active-02,
+    theme.$layer-active-03,
+  ),
+  layer-hover: (
+    theme.$layer-hover-01,
+    theme.$layer-hover-02,
+    theme.$layer-hover-03,
+  ),
+  layer-selected: (
+    theme.$layer-selected-01,
+    theme.$layer-selected-02,
+    theme.$layer-selected-03,
+  ),
+  layer-selected-hover: (
+    theme.$layer-selected-hover-01,
+    theme.$layer-selected-hover-02,
+    theme.$layer-selected-hover-03,
+  ),
+  layer-accent: (
+    theme.$layer-accent-01,
+    theme.$layer-accent-02,
+    theme.$layer-accent-03,
+  ),
+  layer-accent-hover: (
+    theme.$layer-accent-hover-01,
+    theme.$layer-accent-hover-02,
+    theme.$layer-accent-hover-03,
+  ),
+  layer-accent-active: (
+    theme.$layer-accent-active-01,
+    theme.$layer-accent-active-02,
+    theme.$layer-accent-active-03,
+  ),
+  field: (
+    theme.$field-01,
+    theme.$field-02,
+    theme.$field-03,
+  ),
+  field-hover: (
+    theme.$field-hover-01,
+    theme.$field-hover-02,
+    theme.$field-hover-03,
+  ),
+  border-subtle: (
+    theme.$border-subtle-01,
+    theme.$border-subtle-02,
+    theme.$border-subtle-03,
+  ),
+  border-subtle-selected: (
+    theme.$border-subtle-selected-01,
+    theme.$border-subtle-selected-02,
+    theme.$border-subtle-selected-03,
+  ),
+  border-strong: (
+    theme.$border-strong-01,
+    theme.$border-strong-02,
+    theme.$border-strong-03,
+  ),
+);
+
+/// Define a map of layer sets, each set should have values for each layer in
+/// the application. The key of this map is used for the CSS Custom Property
+/// name whose value is updated as more layers are added.
+/// @type {Map}
+$layer-sets: () !default;
+$layer-sets: map.deep-merge($-default-layer-sets, $layer-sets);
+
+/// Emit the layer tokens defined in $layer-sets for the given $level
+/// @param {Number} $level
+@mixin -emit-layer-tokens($level) {
+  @each $key, $layer-set in $layer-sets {
+    $value: list.nth($layer-set, $level);
+    @include custom-property.declaration($key, $value);
+  }
+}
+
+:root {
+  @include -emit-layer-tokens(1);
+}
+
+.#{$prefix}--layer-one {
+  @include -emit-layer-tokens(1);
+}
+
+.#{$prefix}--layer-two {
+  @include -emit-layer-tokens(2);
+}
+
+.#{$prefix}--layer-three {
+  @include -emit-layer-tokens(3);
+}

package/scss/_theme.scss

@@ -19,75 +19,6 @@
 @forward '@carbon/themes/scss/modules/tokens';
 @use '@carbon/themes/scss/modules/tokens';
 @use './utilities/custom-property';
-@use './utilities/layer-set' with (
-  $layer-sets: (
-    layer: (
-      tokens.$layer-01,
-      tokens.$layer-02,
-      tokens.$layer-03,
-    ),
-    layer-active: (
-      tokens.$layer-active-01,
-      tokens.$layer-active-02,
-      tokens.$layer-active-03,
-    ),
-    layer-hover: (
-      tokens.$layer-hover-01,
-      tokens.$layer-hover-02,
-      tokens.$layer-hover-03,
-    ),
-    layer-selected: (
-      tokens.$layer-selected-01,
-      tokens.$layer-selected-02,
-      tokens.$layer-selected-03,
-    ),
-    layer-selected-hover: (
-      tokens.$layer-selected-hover-01,
-      tokens.$layer-selected-hover-02,
-      tokens.$layer-selected-hover-03,
-    ),
-    layer-accent: (
-      tokens.$layer-accent-01,
-      tokens.$layer-accent-02,
-      tokens.$layer-accent-03,
-    ),
-    layer-accent-hover: (
-      tokens.$layer-accent-hover-01,
-      tokens.$layer-accent-hover-02,
-      tokens.$layer-accent-hover-03,
-    ),
-    layer-accent-active: (
-      tokens.$layer-accent-active-01,
-      tokens.$layer-accent-active-02,
-      tokens.$layer-accent-active-03,
-    ),
-    field: (
-      tokens.$field-01,
-      tokens.$field-02,
-      tokens.$field-03,
-    ),
-    field-hover: (
-      tokens.$field-hover-01,
-      tokens.$field-hover-02,
-      tokens.$field-hover-03,
-    ),
-    border-subtle: (
-      tokens.$border-subtle-01,
-      tokens.$border-subtle-02,
-      tokens.$border-subtle-03,
-    ),
-    border-subtle-selected: (
-      tokens.$border-subtle-selected-01,
-      tokens.$border-subtle-selected-02,
-      tokens.$border-subtle-selected-03,
-    ),
-    border-strong: (
-      tokens.$border-strong-01,
-      tokens.$border-strong-02,
-      tokens.$border-strong-03,
-    ),
-  ),
-);
 
 // Layer sets
 $layer: custom-property.get-var('layer');

package/scss/_zone.scss

@@ -10,6 +10,8 @@
 @use './config';
 @use './themes';
 @use './theme';
+// Inline themes depend on layer styles to property reset the layer level
+@use './layer';
 @use './utilities/custom-property';
 
 /// Specify a Map of zones where the key will be used as part of the selector

package/scss/components/button/_button.scss

@@ -15,7 +15,6 @@
 @use '../../utilities/focus-outline';
 @use '../../utilities/high-contrast-mode' as *;
 @use '../../utilities/skeleton' as *;
-@use '../../utilities/tooltip' as *;
 @use '../../utilities/visually-hidden' as *;
 @use 'tokens' as *;
 
@@ -145,118 +144,9 @@
     &.#{$prefix}--btn--md {
       padding: $button-padding-ghost-field;
     }
-  }
-
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger {
-    @include tooltip--trigger('icon', 'bottom');
-
-    svg,
-    &:hover svg,
-    &:focus svg {
-      fill: currentColor;
-    }
-
-    &.#{$prefix}--btn--disabled.#{$prefix}--tooltip--a11y::before,
-    &.#{$prefix}--btn--disabled.#{$prefix}--tooltip--a11y::after,
-    &.#{$prefix}--btn--disabled .#{$prefix}--assistive-text {
-      overflow: hidden;
-      margin: -1px;
-      clip: rect(0, 0, 0, 0);
-      opacity: 0;
-    }
-  }
-
-  // Allow pointer events on tooltip when tooltip is visible
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only:not(.#{$prefix}--tooltip--hidden)
-    .#{$prefix}--assistive-text {
-    pointer-events: all;
-  }
-
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus {
-    border-color: $focus;
-  }
-
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:active:not([disabled]) {
-    border-color: transparent;
-  }
-
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus
-    svg {
-    outline-color: transparent;
-  }
-
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger[disabled]:hover,
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger[disabled]:focus,
-  .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger[disabled]:active {
-    cursor: not-allowed;
-    fill: $icon-on-color-disabled;
-  }
-
-  .#{$prefix}--tooltip__trigger.#{$prefix}--btn--icon-only--top {
-    @include tooltip--trigger('icon', 'top');
-    @include tooltip--placement('icon', 'top', 'center');
-
-    &.#{$prefix}--tooltip--align-start {
-      @include tooltip--placement('icon', 'top', 'start');
-    }
-
-    &.#{$prefix}--tooltip--align-center {
-      @include tooltip--placement('icon', 'top', 'center');
-    }
-
-    &.#{$prefix}--tooltip--align-end {
-      @include tooltip--placement('icon', 'top', 'end');
-    }
-  }
-
-  .#{$prefix}--tooltip__trigger.#{$prefix}--btn--icon-only--right {
-    @include tooltip--trigger('icon', 'right');
-    @include tooltip--placement('icon', 'right', 'center');
-
-    &.#{$prefix}--tooltip--align-start {
-      @include tooltip--placement('icon', 'right', 'start');
-    }
-
-    &.#{$prefix}--tooltip--align-center {
-      @include tooltip--placement('icon', 'right', 'center');
-    }
-
-    &.#{$prefix}--tooltip--align-end {
-      @include tooltip--placement('icon', 'right', 'end');
-    }
-  }
-
-  .#{$prefix}--tooltip__trigger.#{$prefix}--btn--icon-only--bottom {
-    @include tooltip--trigger('icon', 'bottom');
-    @include tooltip--placement('icon', 'bottom', 'center');
-
-    &.#{$prefix}--tooltip--align-start {
-      @include tooltip--placement('icon', 'bottom', 'start');
-    }
-
-    &.#{$prefix}--tooltip--align-center {
-      @include tooltip--placement('icon', 'bottom', 'center');
-    }
-
-    &.#{$prefix}--tooltip--align-end {
-      @include tooltip--placement('icon', 'bottom', 'end');
-    }
-  }
-
-  .#{$prefix}--tooltip__trigger.#{$prefix}--btn--icon-only--left {
-    @include tooltip--trigger('icon', 'left');
-    @include tooltip--placement('icon', 'left', 'center');
-
-    &.#{$prefix}--tooltip--align-start {
-      @include tooltip--placement('icon', 'left', 'start');
-    }
-
-    &.#{$prefix}--tooltip--align-center {
-      @include tooltip--placement('icon', 'left', 'center');
-    }
 
-    &.#{$prefix}--tooltip--align-end {
-      @include tooltip--placement('icon', 'left', 'end');
+    &:not([disabled]) svg {
+      fill: $icon-primary;
     }
   }
 

package/scss/components/button/_tokens.scss

@@ -62,11 +62,11 @@ $button-secondary: (
     ),
     (
       theme: themes.$g10,
-      value: #6f6f6f,
+      value: #393939,
     ),
     (
       theme: themes.$g90,
-      value: #393939,
+      value: #6f6f6f,
     ),
     (
       theme: themes.$g100,
@@ -330,11 +330,11 @@ $button-disabled: (
     ),
     (
       theme: themes.$g90,
-      value: #6f6f6f,
+      value: rgba(141, 141, 141, 0.3),
     ),
     (
       theme: themes.$g100,
-      value: #525252,
+      value: rgba(141, 141, 141, 0.3),
     ),
   ),
 ) !default;

package/scss/components/checkbox/_checkbox.scss

@@ -41,6 +41,9 @@
   // to match the specs.
   .#{$prefix}--checkbox {
     @include visually-hidden;
+    //even though its hidden, positioning is for native validation to be aligned to checkbox
+    top: 1.25rem;
+    left: 0.7rem;
   }
 
   // The label corresponds to the content inside of the `label` tag. Since we're

package/scss/components/form/_form.scss

@@ -50,16 +50,19 @@ $input-label-weight: 400 !default;
     @include type-style('label-01');
 
     display: inline-block;
-    @if not enabled('enable-v11-release') {
-      margin-bottom: $spacing-03;
-    }
-
+    margin-bottom: $spacing-03;
     color: $text-secondary;
     font-weight: $input-label-weight;
     line-height: 1rem;
     vertical-align: baseline;
   }
 
+  @if enabled('enable-v11-release') {
+    .#{$prefix}--label--no-margin {
+      margin-bottom: 0;
+    }
+  }
+
   .#{$prefix}--label .#{$prefix}--tooltip__trigger {
     // When tooltip trigger is put in form label the trigger button should fit in the size of label
     // https://github.com/IBM/carbon-components-react/issues/115

package/scss/components/list-box/_list-box.scss

@@ -743,8 +743,8 @@ $list-box-menu-width: rem(300px);
 
   .#{$prefix}--list-box__menu-item--active:hover,
   .#{$prefix}--list-box__menu-item--active.#{$prefix}--list-box__menu-item--highlighted {
-    border-bottom-color: $layer-selected;
-    background-color: $layer-selected;
+    border-bottom-color: $layer-selected-hover;
+    background-color: $layer-selected-hover;
   }
 
   .#{$prefix}--list-box__menu-item--active

package/scss/components/overflow-menu/_overflow-menu.scss

@@ -16,6 +16,7 @@
 @use '../../utilities/focus-outline' as *;
 @use '../../utilities/high-contrast-mode' as *;
 @use '../../utilities/convert' as *;
+@use '../../utilities/z-index' as *;
 
 /// Overflow menu styles
 /// @access public

package/scss/components/popover/_popover.scss

@@ -61,6 +61,15 @@ $popover-text-color: custom-property.get-var(
 // stylelint-disable-next-line length-zero-no-unit
 $popover-offset: custom-property.get-var('popover-offset', 0rem);
 
+// Customize the dimensions of the caret by specifying its width or height.
+// These values will be flipped in left or right directions to have the
+// correct dimensions
+$popover-caret-width: custom-property.get-var('popover-caret-width', rem(12px));
+$popover-caret-height: custom-property.get-var(
+  'popover-caret-height',
+  rem(6px)
+);
+
 @mixin popover {
   // Container
   .#{$prefix}--popover-container {
@@ -202,8 +211,8 @@ $popover-offset: custom-property.get-var('popover-offset', 0rem);
   .#{$prefix}--popover--bottom-right .#{$prefix}--popover-caret {
     bottom: 0;
     left: 50%;
-    width: rem(12px);
-    height: rem(6px);
+    width: $popover-caret-width;
+    height: $popover-caret-height;
     clip-path: polygon(0% 100%, 50% 0%, 100% 100%);
     transform: translate(-50%, $popover-offset);
   }
@@ -248,8 +257,8 @@ $popover-offset: custom-property.get-var('popover-offset', 0rem);
   .#{$prefix}--popover--top-right .#{$prefix}--popover-caret {
     top: 0;
     left: 50%;
-    width: rem(12px);
-    height: rem(6px);
+    width: $popover-caret-width;
+    height: $popover-caret-height;
     clip-path: polygon(0% 0%, 50% 100%, 100% 0%);
     transform: translate(-50%, calc(-1 * $popover-offset));
   }
@@ -296,8 +305,8 @@ $popover-offset: custom-property.get-var('popover-offset', 0rem);
   .#{$prefix}--popover--right-bottom .#{$prefix}--popover-caret {
     top: 50%;
     left: 100%;
-    width: rem(6px);
-    height: rem(12px);
+    width: $popover-caret-height;
+    height: $popover-caret-width;
     clip-path: polygon(0% 50%, 100% 0%, 100% 100%);
     transform: translate(calc($popover-offset - 100%), -50%);
   }
@@ -348,8 +357,8 @@ $popover-offset: custom-property.get-var('popover-offset', 0rem);
   .#{$prefix}--popover--left-bottom .#{$prefix}--popover-caret {
     top: 50%;
     right: 100%;
-    width: rem(6px);
-    height: rem(12px);
+    width: $popover-caret-height;
+    height: $popover-caret-width;
     clip-path: polygon(0% 0%, 100% 50%, 0% 100%);
     transform: translate(calc(-1 * $popover-offset + 100%), -50%);
   }

package/scss/components/radio-button/_radio-button.scss

@@ -121,15 +121,15 @@ $radio-border-width: 1px !default;
     }
   }
 
-  .#{$prefix}--radio-button:button-disabled + .#{$prefix}--radio-button__label {
+  .#{$prefix}--radio-button:disabled + .#{$prefix}--radio-button__label {
     color: $button-disabled;
     cursor: not-allowed;
   }
 
-  .#{$prefix}--radio-button:button-disabled
+  .#{$prefix}--radio-button:disabled
     + .#{$prefix}--radio-button__label
     .#{$prefix}--radio-button__appearance,
-  .#{$prefix}--radio-button:button-disabled:checked
+  .#{$prefix}--radio-button:disabled:checked
     + .#{$prefix}--radio-button__label
     .#{$prefix}--radio-button__appearance {
     border-color: $border-disabled;