Merge branch 'master' into 4721-filterable-multiselect-dynamic-sizing

carbon-design-system · Dec 14, 2020 · 42f94f4 · 42f94f4
2 parents 6428b8c + 8e8867c
commit 42f94f4
Show file tree

Hide file tree

Showing 36 changed files with 365 additions and 81 deletions.
diff --git a/config/storybook-preset-carbon/index.js b/config/storybook-preset-carbon/index.js
@@ -13,6 +13,8 @@ module.exports = {
     '@storybook/addon-actions',
     '@storybook/addon-links',
     '@storybook/addon-docs',
+    '@storybook/addon-notes/register',
+    'storybook-readme/register',
 
     // Phase 1: port over add-ons from packages/react/.storybook
     // Phase 2: port over webpack config for Sass

diff --git a/config/storybook-preset-carbon/package.json b/config/storybook-preset-carbon/package.json
@@ -22,6 +22,10 @@
     "@storybook/addon-docs": "^5.3.19",
     "@storybook/addon-knobs": "^5.3.19",
     "@storybook/addon-links": "^5.3.19",
-    "@storybook/addon-storysource": "^5.3.19"
+    "@storybook/addon-notes": "^5.3.19",
+    "@storybook/addon-storysource": "^5.3.19",
+    "@storybook/addons": "^5.3.19",
+    "@storybook/react": "^5.3.19",
+    "storybook-readme": "^5.0.8"
   }
 }
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -137,6 +137,7 @@ Array [
   "CommercialFinancing_02",
   "ConceptExpansion",
   "ConceptInsights",
+  "ConditionBuilder",
   "Connect",
   "ConnectedEcosystem",
   "ConnectedNodesToTheCloud",
@@ -228,6 +229,7 @@ Array [
   "Feedback_02",
   "FileBackup",
   "FileTransfer",
+  "FilterVariable",
   "FinanceStrategy",
   "FinancialConsultant",
   "FinancialGain",
@@ -397,9 +399,11 @@ Array [
   "Nice",
   "NightClear",
   "NycBrooklyn",
+  "NycChryslerBuilding",
   "NycManhattan_01",
   "NycManhattan_02",
   "NycStatueOfLiberty",
+  "NycWorldTradeCenter",
   "Office",
   "OilPump",
   "OilRig",
@@ -460,6 +464,7 @@ Array [
   "Rainy",
   "RainyHeavy",
   "RaleighNc",
+  "RandomSamples",
   "Rank",
   "Receipt",
   "Recycle",
@@ -479,6 +484,7 @@ Array [
   "RichTextFormat",
   "Robot",
   "Robotics",
+  "RockOn",
   "Rome",
   "SaasEnablement",
   "SampleFile",
@@ -498,6 +504,7 @@ Array [
   "SecurityHygiene",
   "SecurityIntelligence",
   "SecurityShield",
+  "SelectRange",
   "ServerRack",
   "Servers",
   "Shirt",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -137,6 +137,7 @@ Array [
   "CommercialFinancing_02",
   "ConceptExpansion",
   "ConceptInsights",
+  "ConditionBuilder",
   "Connect",
   "ConnectedEcosystem",
   "ConnectedNodesToTheCloud",
@@ -228,6 +229,7 @@ Array [
   "Feedback_02",
   "FileBackup",
   "FileTransfer",
+  "FilterVariable",
   "FinanceStrategy",
   "FinancialConsultant",
   "FinancialGain",
@@ -396,9 +398,11 @@ Array [
   "Nice",
   "NightClear",
   "NycBrooklyn",
+  "NycChryslerBuilding",
   "NycManhattan_01",
   "NycManhattan_02",
   "NycStatueOfLiberty",
+  "NycWorldTradeCenter",
   "Office",
   "OilPump",
   "OilRig",
@@ -459,6 +463,7 @@ Array [
   "Rainy",
   "RainyHeavy",
   "RaleighNc",
+  "RandomSamples",
   "Rank",
   "Receipt",
   "Recycle",
@@ -478,6 +483,7 @@ Array [
   "RichTextFormat",
   "Robot",
   "Robotics",
+  "RockOn",
   "Rome",
   "SaasEnablement",
   "SampleFile",
@@ -497,6 +503,7 @@ Array [
   "SecurityHygiene",
   "SecurityIntelligence",
   "SecurityShield",
+  "SelectRange",
   "ServerRack",
   "Servers",
   "Shirt",

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -20837,12 +20837,6 @@ File uploader styles
       margin: 0;
     }
 
-    .#{$prefix}--loading {
-      width: rem(32px);
-      height: rem(32px);
-      margin-right: -$carbon--spacing-03;
-    }
-
     .#{$prefix}--inline-loading__animation .#{$prefix}--loading {
       // Vanilla markup has `.bx--inline-loading__animation` which is used for `margin-right` adjustment
       margin-right: 0;
@@ -22421,7 +22415,7 @@ Loading styles
   }
 
   .#{$prefix}--loading__svg circle {
-    stroke-width: 8;
+    stroke-width: 10;
     stroke-linecap: butt;
     stroke-dasharray: 240;
   }
@@ -22440,10 +22434,11 @@ Loading styles
   }
 
   .#{$prefix}--loading--small {
-    width: 2rem;
-    height: 2rem;
+    width: rem(16px);
+    height: rem(16px);
+
     circle {
-      stroke-width: 12;
+      stroke-width: 16;
     }
   }
 
@@ -22453,7 +22448,7 @@ Loading styles
 
   .#{$prefix}--loading__background {
     stroke: $ui-03;
-    stroke-dashoffset: 0;
+    stroke-dashoffset: -22;
   }
 
   .#{$prefix}--loading-overlay {
@@ -22553,7 +22548,7 @@ Loading styles
 <summary>Source code</summary>
 
 ```scss
-$loading__gap: 40;
+$loading__gap: 16;
 ```
 
 </details>
@@ -22569,7 +22564,7 @@ $loading__gap: 40;
 <summary>Source code</summary>
 
 ```scss
-$loading--small__gap: 99;
+$loading--small__gap: 25;
 ```
 
 </details>
@@ -22586,7 +22581,7 @@ $loading--small__gap: 99;
 <summary>Source code</summary>
 
 ```scss
-$loading__size: 10.5rem;
+$loading__size: 5.5rem;
 ```
 
 </details>

diff --git a/packages/components/src/components/file-uploader/_file-uploader.scss b/packages/components/src/components/file-uploader/_file-uploader.scss
@@ -139,12 +139,6 @@
       margin: 0;
     }
 
-    .#{$prefix}--loading {
-      width: rem(32px);
-      height: rem(32px);
-      margin-right: -$carbon--spacing-03;
-    }
-
     .#{$prefix}--inline-loading__animation .#{$prefix}--loading {
       // Vanilla markup has `.bx--inline-loading__animation` which is used for `margin-right` adjustment
       margin-right: 0;

diff --git a/packages/components/src/components/loading/_loading.scss b/packages/components/src/components/loading/_loading.scss
@@ -30,7 +30,7 @@
   }
 
   .#{$prefix}--loading__svg circle {
-    stroke-width: 8;
+    stroke-width: 10;
     stroke-linecap: butt;
     stroke-dasharray: 240;
   }
@@ -49,10 +49,11 @@
   }
 
   .#{$prefix}--loading--small {
-    width: 2rem;
-    height: 2rem;
+    width: rem(16px);
+    height: rem(16px);
+
     circle {
-      stroke-width: 12;
+      stroke-width: 16;
     }
   }
 
@@ -62,7 +63,7 @@
 
   .#{$prefix}--loading__background {
     stroke: $ui-03;
-    stroke-dashoffset: 0;
+    stroke-dashoffset: -22;
   }
 
   .#{$prefix}--loading-overlay {

diff --git a/packages/components/src/components/loading/_vars.scss b/packages/components/src/components/loading/_vars.scss
@@ -8,14 +8,14 @@
 /// @type Number
 /// @access private
 /// @group loading
-$loading__gap: 40;
+$loading__gap: 16;
 
 /// @type Number
 /// @access private
 /// @group loading
-$loading--small__gap: 99;
+$loading--small__gap: 25;
 
 /// @type Number
 /// @access private
 /// @group loading
-$loading__size: 10.5rem;
+$loading__size: 5.5rem;
diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -84,9 +84,11 @@ categories:
       - munich
       - nice
       - nyc--brooklyn
+      - nyc--chrysler-building
       - nyc--manhattan--01
       - nyc--manhattan--02
       - nyc--statue-of-liberty
+      - nyc--world-trade-center
       - paris--arc-de-triomphe
       - paris--louvre
       - paris--notre-dame
@@ -137,13 +139,15 @@ categories:
       - cloud--strategy
       - cloud--tutorials
       - cloud--vmware
+      - condition--builder
       - cognos--analytics
       - construct
       - devops
       - digital
       - docker
       - expand--horz
       - expand--vert
+      - filter--variable
       - free--trial
       - global--business--services
       - global--technology--services
@@ -158,7 +162,9 @@ categories:
       - mas
       - mqa
       - planning--analytics
+      - random--samples
       - saas--enablement
+      - select--range
       - single--sign-on
       - softlayer--enablement
   - name: Controls
@@ -451,6 +457,7 @@ categories:
       - flower--02
       - perfume
       - racetrack
+      - rock-on
       - scale
       - soft--ice--cream
       - sports