Merge branch 'master' into update-combobox-devdocs

carbon-design-system · Sep 28, 2020 · 877aeff · 877aeff
2 parents 92192f0 + f1bf6c9
commit 877aeff
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 24 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -7035,9 +7035,6 @@ $text-05: if(
 - **Type**: `{undefined}`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
-  - [date-picker [mixin]](#date-picker-mixin)
-  - [search [mixin]](#search-mixin)
-  - [time-picker [mixin]](#time-picker-mixin)
 
 ### ✅text-error [variable]
 
@@ -17398,8 +17395,7 @@ Date picker styles
     }
 
     &::placeholder {
-      color: $text-05;
-      opacity: 1;
+      @include placeholder-colors;
     }
   }
 
@@ -17474,7 +17470,6 @@ Date picker styles
   - [field-01 [variable]](#field-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)
 
@@ -22619,8 +22614,7 @@ Search styles
     }
 
     &::placeholder {
-      color: $text-05;
-      font-weight: 400;
+      @include placeholder-colors;
     }
 
     &::-ms-clear {
@@ -22636,7 +22630,6 @@ Search styles
 
     &::placeholder {
       color: $disabled;
-      font-weight: 400;
     }
   }
 
@@ -22842,7 +22835,6 @@ Search styles
   - [text-01 [variable]](#text-01-variable)
   - [field-01 [variable]](#field-01-variable)
   - [ui-04 [variable]](#ui-04-variable)
-  - [text-05 [variable]](#text-05-variable)
   - [field-02 [variable]](#field-02-variable)
   - [spacing-07 [variable]](#spacing-07-variable)
   - [spacing-08 [variable]](#spacing-08-variable)
@@ -24787,7 +24779,7 @@ Time picker styles
         $duration--fast-01 motion(standard, productive);
 
     &::placeholder {
-      color: $text-05;
+      @include placeholder-colors;
     }
   }
 
@@ -24815,7 +24807,6 @@ Time picker styles
 - **Requires**:
   - [prefix [variable]](#prefix-variable)
   - [carbon--spacing-01 [variable]](#carbon--spacing-01-variable)
-  - [text-05 [variable]](#text-05-variable)
   - [field-02 [variable]](#field-02-variable)
   - [hover-ui [variable]](#hover-ui-variable)
   - [disabled-02 [variable]](#disabled-02-variable)

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

diff --git a/packages/components/src/components/search/_search.scss b/packages/components/src/components/search/_search.scss
@@ -52,8 +52,7 @@
     }
 
     &::placeholder {
-      color: $text-05;
-      font-weight: 400;
+      @include placeholder-colors;
     }
 
     &::-ms-clear {
@@ -69,7 +68,6 @@
 
     &::placeholder {
       color: $disabled;
-      font-weight: 400;
     }
   }
 

diff --git a/packages/components/src/components/time-picker/_time-picker.scss b/packages/components/src/components/time-picker/_time-picker.scss
@@ -57,7 +57,7 @@
       background-color $duration--fast-01 motion(standard, productive);
 
     &::placeholder {
-      color: $text-05;
+      @include placeholder-colors;
     }
   }
 

diff --git a/packages/components/src/globals/scss/_helper-mixins.scss b/packages/components/src/globals/scss/_helper-mixins.scss
@@ -46,7 +46,7 @@
 /// @example @include placeholder-colors;
 /// @group global-helpers
 @mixin placeholder-colors {
-  color: $text-03;
+  color: $text-05;
   opacity: 1;
 }
 

diff --git a/packages/react/src/components/Select/Select-story.js b/packages/react/src/components/Select/Select-story.js
@@ -37,7 +37,7 @@ const props = {
       'Form validation UI content (invalidText in <Select>)',
       'A valid value is required'
     ),
-    labelText: text('Label text (helperText)', 'Select'),
+    labelText: text('Label text (labelText)', 'Select'),
     helperText: text('Helper text (helperText)', 'Optional helper text.'),
     onChange: action('onChange'),
   }),

diff --git a/packages/sketch/src/commands/icons/shared.js b/packages/sketch/src/commands/icons/shared.js
@@ -90,13 +90,10 @@ function createSVGArtboards(
   return icons
     .filter((icon) => !icon.deprecated)
     .flatMap((icon) => {
-      const defaultAsset = icon.assets.find((asset) => asset.size === 32);
-
       X_OFFSET = 0;
 
       const artboards = sizes.map((size) => {
-        const asset =
-          icon.assets.find((asset) => asset.size === size) || defaultAsset;
+        const asset = icon.assets.find((asset) => asset.size === 32);
         const svgString = NSString.stringWithString(asset.source);
         const svgData = svgString.dataUsingEncoding(NSUTF8StringEncoding);
         const svgImporter = MSSVGImporter.svgImporter();