Merge branch 'master' into 4427-filtertags

carbon-design-system · Jan 6, 2020 · 5e25686 · 5e25686
2 parents 582848e + 88c97e3
commit 5e25686
Show file tree

Hide file tree

Showing 46 changed files with 212 additions and 136 deletions.
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@babel/preset-env": "^7.4.4",
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "^7.4.4",
-    "@carbon/cli": "10.7.0-rc.0",
+    "@carbon/cli": "10.7.0",
     "@commitlint/cli": "^7.5.2",
     "@commitlint/config-conventional": "^7.5.0",
     "@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.3-alpha.tgz",

diff --git a/packages/bundler/package.json b/packages/bundler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/bundler",
   "description": "Bundler used for libraries in the Carbon Design System",
-  "version": "10.5.0-rc.0",
+  "version": "10.5.0",
   "license": "Apache-2.0",
   "bin": {
     "bundler": "./bin/bundler.js"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.7.0-rc.0",
+  "version": "10.7.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"

diff --git a/packages/colors/package.json b/packages/colors/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "10.7.0-rc.0",
+  "version": "10.7.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,10 +31,10 @@
     "clean": "rimraf css es lib umd scss"
   },
   "devDependencies": {
-    "@carbon/bundler": "^10.5.0-rc.0",
+    "@carbon/bundler": "^10.5.0",
     "@carbon/cli-reporter": "10.3.0",
-    "@carbon/scss-generator": "^10.5.0-rc.0",
-    "@carbon/test-utils": "^10.6.0-rc.0",
+    "@carbon/scss-generator": "^10.5.0",
+    "@carbon/test-utils": "^10.6.0",
     "change-case": "^3.0.2",
     "core-js": "^3.0.1",
     "fs-extra": "^7.0.0",

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -2550,6 +2550,11 @@ Convert a given px unit to a rem unit
 
 ```scss
 @function carbon--rem($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $carbon--base-font-size) * 1rem;
 }
 ```
@@ -2579,6 +2584,11 @@ Convert a given px unit to a em unit
 
 ```scss
 @function carbon--em($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $carbon--base-font-size) * 1em;
 }
 ```
@@ -3682,6 +3692,7 @@ $spacing-05: $carbon--spacing-05;
 - **Alias**: `carbon--spacing-05`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
+  - [snippet [mixin]](#snippet-mixin)
   - [data-table-v2-action [mixin]](#data-table-v2-action-mixin)
   - [data-table-core [mixin]](#data-table-core-mixin)
   - [data-table-expandable [mixin]](#data-table-expandable-mixin)
@@ -6353,7 +6364,6 @@ $text-02: if(
 - **Type**: `{undefined}`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
-  - [combo-box [mixin]](#combo-box-mixin)
   - [content-switcher [mixin]](#content-switcher-mixin)
   - [data-table-core [mixin]](#data-table-core-mixin)
   - [date-picker [mixin]](#date-picker-mixin)
@@ -6447,9 +6457,11 @@ $text-05: if(
 - **Type**: `{undefined}`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
+  - [combo-box [mixin]](#combo-box-mixin)
+  - [date-picker [mixin]](#date-picker-mixin)
   - [form [mixin]](#form-mixin)
   - [search [mixin]](#search-mixin)
-  - [text-area [mixin]](#text-area-mixin)
+  - [time-picker [mixin]](#time-picker-mixin)
 
 ### ✅icon-01 [variable]
 
@@ -11746,7 +11758,7 @@ $productive-heading-07: (
 $expressive-heading-01: map-merge(
   $heading-01,
   (
-    line-height: carbon--rem(20),
+    line-height: carbon--rem(20px),
   )
 );
 ```
@@ -11765,7 +11777,7 @@ $expressive-heading-01: map-merge(
 $expressive-heading-02: map-merge(
   $heading-02,
   (
-    line-height: carbon--rem(24),
+    line-height: carbon--rem(24px),
   )
 );
 ```
@@ -13481,8 +13493,9 @@ Code snippet styles
   // expanded snippet container
   .#{$prefix}--snippet--multi.#{$prefix}--snippet--expand
     .#{$prefix}--snippet-container {
-    max-height: rem(1500px);
+    max-height: 100%;
     transition: max-height $duration--moderate-01 motion(standard, productive);
+    padding-bottom: $spacing-05;
   }
 
   // closed pre
@@ -13783,6 +13796,7 @@ Code snippet styles
   - [spacing-03 [variable]](#spacing-03-variable)
   - [carbon--spacing-08 [variable]](#carbon--spacing-08-variable)
   - [carbon--spacing-05 [variable]](#carbon--spacing-05-variable)
+  - [spacing-05 [variable]](#spacing-05-variable)
   - [icon-01 [variable]](#icon-01-variable)
   - [carbon--spacing-07 [variable]](#carbon--spacing-07-variable)
   - [hover-ui [variable]](#hover-ui-variable)
@@ -13826,8 +13840,7 @@ Combo box styles
 @mixin combo-box() {
   .#{$prefix}--combo-box .#{$prefix}--text-input {
     &::placeholder {
-      color: $text-02;
-      opacity: 1;
+      color: $text-05;
     }
 
     &[disabled]::placeholder {
@@ -13853,7 +13866,7 @@ Combo box styles
 - **Group**: [combo-box](#combo-box)
 - **Requires**:
   - [prefix [variable]](#prefix-variable)
-  - [text-02 [variable]](#text-02-variable)
+  - [text-05 [variable]](#text-05-variable)
   - [disabled-02 [variable]](#disabled-02-variable)
   - [ui-03 [variable]](#ui-03-variable)
 
@@ -15843,7 +15856,7 @@ Date picker styles
     }
 
     &::placeholder {
-      @include placeholder-colors;
+      color: $text-05;
       opacity: 1;
     }
   }
@@ -16226,6 +16239,7 @@ Date picker styles
   - [text-01 [variable]](#text-01-variable)
   - [ui-04 [variable]](#ui-04-variable)
   - [disabled-02 [variable]](#disabled-02-variable)
+  - [text-05 [variable]](#text-05-variable)
   - [icon-01 [variable]](#icon-01-variable)
   - [carbon--spacing-09 [variable]](#carbon--spacing-09-variable)
   - [ui-01 [variable]](#ui-01-variable)
@@ -22085,7 +22099,7 @@ Text area styles
   }
 
   .#{$prefix}--text-area::placeholder {
-    color: $text-05;
+    @include placeholder-colors;
     @include type-style('body-long-01');
     opacity: 1;
   }
@@ -22147,7 +22161,6 @@ Text area styles
   - [ui-04 [variable]](#ui-04-variable)
   - [support-01 [variable]](#support-01-variable)
   - [carbon--spacing-02 [variable]](#carbon--spacing-02-variable)
-  - [text-05 [variable]](#text-05-variable)
   - [field-02 [variable]](#field-02-variable)
   - [carbon--spacing-08 [variable]](#carbon--spacing-08-variable)
   - [carbon--spacing-04 [variable]](#carbon--spacing-04-variable)
@@ -22550,6 +22563,10 @@ Time picker styles
     height: rem(40px);
     transition: outline $duration--fast-01 motion(standard, productive), background-color
         $duration--fast-01 motion(standard, productive);
+
+    &::placeholder {
+      color: $text-05;
+    }
   }
 }
 ```
@@ -22560,6 +22577,7 @@ Time picker styles
 - **Requires**:
   - [prefix [variable]](#prefix-variable)
   - [carbon--spacing-01 [variable]](#carbon--spacing-01-variable)
+  - [text-05 [variable]](#text-05-variable)
 
 ## toggle
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "carbon-components",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "10.9.0-rc.0",
+  "version": "10.9.0",
   "license": "Apache-2.0",
   "main": "umd/index.js",
   "module": "es/index.js",
@@ -80,10 +80,10 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "^7.5.2",
-    "@carbon/elements": "^10.9.0-rc.0",
-    "@carbon/icons-handlebars": "^10.8.0-rc.0",
-    "@carbon/icons-react": "^10.8.0-rc.0",
-    "@carbon/test-utils": "^10.6.0-rc.0",
+    "@carbon/elements": "^10.9.0",
+    "@carbon/icons-handlebars": "^10.8.0",
+    "@carbon/icons-react": "^10.8.0",
+    "@carbon/test-utils": "^10.6.0",
     "@frctl/fractal": "^1.1.0",
     "adaro": "1.0.4",
     "autoprefixer": "^8.2.0",

diff --git a/packages/components/src/components/code-snippet/_code-snippet.scss b/packages/components/src/components/code-snippet/_code-snippet.scss
@@ -114,8 +114,9 @@
   // expanded snippet container
   .#{$prefix}--snippet--multi.#{$prefix}--snippet--expand
     .#{$prefix}--snippet-container {
-    max-height: rem(1500px);
+    max-height: 100%;
     transition: max-height $duration--moderate-01 motion(standard, productive);
+    padding-bottom: $spacing-05;
   }
 
   // closed pre

diff --git a/packages/components/src/components/combo-box/_combo-box.scss b/packages/components/src/components/combo-box/_combo-box.scss
@@ -19,8 +19,7 @@
 @mixin combo-box {
   .#{$prefix}--combo-box .#{$prefix}--text-input {
     &::placeholder {
-      color: $text-02;
-      opacity: 1;
+      color: $text-05;
     }
 
     &[disabled]::placeholder {

diff --git a/packages/components/src/components/date-picker/_date-picker.scss b/packages/components/src/components/date-picker/_date-picker.scss
@@ -120,7 +120,7 @@
     }
 
     &::placeholder {
-      @include placeholder-colors;
+      color: $text-05;
       opacity: 1;
     }
   }

diff --git a/packages/components/src/components/text-area/_text-area.scss b/packages/components/src/components/text-area/_text-area.scss
@@ -61,7 +61,7 @@
   }
 
   .#{$prefix}--text-area::placeholder {
-    color: $text-05;
+    @include placeholder-colors;
     @include type-style('body-long-01');
     opacity: 1;
   }

diff --git a/packages/components/src/components/time-picker/_time-picker.scss b/packages/components/src/components/time-picker/_time-picker.scss
@@ -58,6 +58,10 @@
     height: rem(40px);
     transition: outline $duration--fast-01 motion(standard, productive),
       background-color $duration--fast-01 motion(standard, productive);
+
+    &::placeholder {
+      color: $text-05;
+    }
   }
 }
 

diff --git a/packages/components/src/globals/scss/_typography.scss b/packages/components/src/globals/scss/_typography.scss
@@ -22,6 +22,11 @@ $base-font-size: 16px !default;
 /// @group global-typography
 /// @deprecated (For v10) Use `carbon--rem()`
 @function rem($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $base-font-size) * 1rem;
 }
 
@@ -33,6 +38,11 @@ $base-font-size: 16px !default;
 /// @group global-typography
 /// @deprecated (For v10) Use `carbon--em()`
 @function em($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $base-font-size) * 1em;
 }
 

diff --git a/packages/elements/docs/sass.md b/packages/elements/docs/sass.md
@@ -2326,6 +2326,11 @@ Convert a given px unit to a rem unit
 
 ```scss
 @function carbon--rem($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $carbon--base-font-size) * 1rem;
 }
 ```
@@ -2354,6 +2359,11 @@ Convert a given px unit to a em unit
 
 ```scss
 @function carbon--em($px) {
+  @if unit($px) != 'px' {
+    // TODO: update to @error in v11
+    @warn "Expected argument $px to be of type `px`, instead received: `#{unit($px)}`";
+  }
+
   @return ($px / $carbon--base-font-size) * 1em;
 }
 ```
@@ -11048,7 +11058,7 @@ $productive-heading-07: (
 $expressive-heading-01: map-merge(
   $heading-01,
   (
-    line-height: carbon--rem(20),
+    line-height: carbon--rem(20px),
   )
 );
 ```
@@ -11067,7 +11077,7 @@ $expressive-heading-01: map-merge(
 $expressive-heading-02: map-merge(
   $heading-02,
   (
-    line-height: carbon--rem(24),
+    line-height: carbon--rem(24px),
   )
 );
 ```

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/elements",
   "description": "A collection of design elements in code for the IBM Design Language",
-  "version": "10.9.0-rc.0",
+  "version": "10.9.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,17 +31,17 @@
     "clean": "rimraf es lib umd && node tasks/clean.js"
   },
   "dependencies": {
-    "@carbon/colors": "^10.7.0-rc.0",
-    "@carbon/grid": "^10.8.0-rc.0",
-    "@carbon/icons": "^10.8.0-rc.0",
+    "@carbon/colors": "^10.7.0",
+    "@carbon/grid": "^10.8.0",
+    "@carbon/icons": "^10.8.0",
     "@carbon/import-once": "10.3.0",
-    "@carbon/layout": "^10.7.0-rc.0",
-    "@carbon/motion": "^10.5.0-rc.0",
-    "@carbon/themes": "^10.9.0-rc.0",
-    "@carbon/type": "^10.8.0-rc.0"
+    "@carbon/layout": "^10.7.0",
+    "@carbon/motion": "^10.5.0",
+    "@carbon/themes": "^10.9.0",
+    "@carbon/type": "^10.8.0"
   },
   "devDependencies": {
-    "@carbon/bundler": "^10.5.0-rc.0",
+    "@carbon/bundler": "^10.5.0",
     "fs-extra": "^7.0.1",
     "klaw-sync": "^6.0.0",
     "replace-in-file": "^3.4.2",