Merge branch 'master' into storybook-config-2

carbon-design-system · Dec 14, 2020 · f6ca8a3 · f6ca8a3
2 parents 98fc271 + 2852b49
commit f6ca8a3
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 17 deletions.
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -399,9 +399,11 @@ Array [
   "Nice",
   "NightClear",
   "NycBrooklyn",
+  "NycChryslerBuilding",
   "NycManhattan_01",
   "NycManhattan_02",
   "NycStatueOfLiberty",
+  "NycWorldTradeCenter",
   "Office",
   "OilPump",
   "OilRig",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -398,9 +398,11 @@ Array [
   "Nice",
   "NightClear",
   "NycBrooklyn",
+  "NycChryslerBuilding",
   "NycManhattan_01",
   "NycManhattan_02",
   "NycStatueOfLiberty",
+  "NycWorldTradeCenter",
   "Office",
   "OilPump",
   "OilRig",

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/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

diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml
@@ -2773,6 +2773,18 @@
     - Brooklyn
     - city
     - cities
+- name: nyc--chrysler-building
+  friendly_name: NYC Chrysler Building
+  aliases:
+    - NYC Chrysler Building
+    - New York City
+    - NYC
+    - landmark
+    - building
+    - skyscraper
+    - city
+    - cities
+    - architecture
 - name: nyc--manhattan--01
   friendly_name: NYC Manhattan 01
   aliases:
@@ -2801,6 +2813,18 @@
     - Liberty
     - city
     - cities
+- name: nyc--world-trade-center
+  friendly_name: NYC World Trade Center
+  aliases:
+    - NYC World Trade Center
+    - New York City
+    - NYC
+    - landmark
+    - building
+    - skyscraper
+    - city
+    - cities
+    - architecture
 - name: office
   friendly_name: Office
   aliases:

diff --git a/packages/pictograms/src/svg/nyc--chrysler-building.svg b/packages/pictograms/src/svg/nyc--chrysler-building.svg
diff --git a/packages/pictograms/src/svg/nyc--world-trade-center.svg b/packages/pictograms/src/svg/nyc--world-trade-center.svg
diff --git a/packages/sketch/src/commands/icons/shared.js b/packages/sketch/src/commands/icons/shared.js
@@ -188,8 +188,6 @@ function createSVGArtboards(
           });
         }
 
-        shape.style.borders = [];
-
         for (const layer of transparent) {
           layer.remove();
         }

diff --git a/packages/sketch/src/tools/sharedStyles.js b/packages/sketch/src/tools/sharedStyles.js
@@ -35,12 +35,14 @@ export function syncSharedStyle(
 
   // If none exists, we can create one from scratch
   if (!sharedStyle) {
-    return SharedStyle.fromStyle({
+    const generatedSharedStyle = SharedStyle.fromStyle({
       name,
       style,
       styleType,
       document,
     });
+    generatedSharedStyle.style.borders = [];
+    return generatedSharedStyle;
   }
 
   // Otherwise, we'll go and update values of the sharedStyle with the given
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,8 +188,6 @@ function createSVGArtboards( @@
               });
             }
-            shape.style.borders = [];
             for (const layer of transparent) {
               layer.remove();
             }
@@ Expand Down @@