Merge branch 'main' into update-ui-shell-story

carbon-design-system · Aug 3, 2021 · e78c734 · e78c734
2 parents 72511db + 202d546
commit e78c734
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 44 deletions.
diff --git a/.yarn/cache/sass-npm-1.32.13-89da6086e7-51b798280b.zip b/.yarn/cache/sass-npm-1.32.13-89da6086e7-51b798280b.zip
diff --git a/.yarn/cache/sass-npm-1.36.0-1ecc2af923-fdb03deed1.zip b/.yarn/cache/sass-npm-1.36.0-1ecc2af923-fdb03deed1.zip
diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json
@@ -83,7 +83,7 @@
     "rollup": "^2.46.0",
     "rollup-plugin-strip-banner": "^2.0.0",
     "rtlcss": "^3.1.2",
-    "sass": "^1.32.12",
+    "sass": "^1.36.0",
     "sass-loader": "10",
     "style-loader": "^2.0.0",
     "webpack": "^4.41.5"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -48,7 +48,7 @@
     "remark": "^10.0.1",
     "replace-in-file": "^6.1.0",
     "rollup": "^2.46.0",
-    "sass": "^1.32.4",
+    "sass": "^1.36.0",
     "sassdoc": "^2.7.3",
     "yargs": "^15.1.0"
   }

diff --git a/packages/colors/examples/sass-modules/package.json b/packages/colors/examples/sass-modules/package.json
@@ -11,6 +11,6 @@
     "next": "^10.0.3",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "sass": "^1.29.0"
+    "sass": "^1.36.0"
   }
 }
diff --git a/packages/colors/package.json b/packages/colors/package.json
@@ -15,7 +15,8 @@
     "es",
     "lib",
     "scss",
-    "umd"
+    "umd",
+    "index.scss"
   ],
   "keywords": [
     "eyeglass-module",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -163,7 +163,7 @@
     "rollup": "^2.46.0",
     "rollup-plugin-filesize": "^9.1.1",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.24.5",
+    "sass": "^1.36.0",
     "sass-loader": "^8.0.2",
     "serve-static": "^1.13.0",
     "style-loader": "^1.1.3",

diff --git a/packages/grid/examples/css-grid/package.json b/packages/grid/examples/css-grid/package.json
@@ -12,6 +12,6 @@
     "next": "^10.0.7",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "sass": "^1.32.7"
+    "sass": "^1.36.0"
   }
 }
diff --git a/packages/grid/package.json b/packages/grid/package.json
@@ -11,7 +11,8 @@
   "bugs": "https://github.com/carbon-design-system/carbon/issues",
   "files": [
     "css",
-    "scss"
+    "scss",
+    "index.scss"
   ],
   "keywords": [
     "eyeglass-module",

diff --git a/packages/grid/scss/modules/_css-grid.scss b/packages/grid/scss/modules/_css-grid.scss
@@ -5,6 +5,8 @@
 // LICENSE file in the root directory of this source tree.
 //
 
+@use "sass:math";
+
 @use 'sass:map';
 @use 'config' as *;
 @use 'breakpoint' as *;
@@ -411,7 +413,7 @@ $carbon--aspect-ratios: (
     $height: nth($aspect-ratio, 2);
 
     .#{$prefix}--aspect-ratio--#{$width}x#{$height}::before {
-      padding-top: percentage($height / $width);
+      padding-top: percentage(math.div($height, $width));
     }
   }
 }

diff --git a/packages/grid/scss/modules/_mixins.scss b/packages/grid/scss/modules/_mixins.scss
@@ -5,6 +5,8 @@
 // LICENSE file in the root directory of this source tree.
 //
 
+@use "sass:math";
+
 @use 'config' as *;
 @use 'breakpoint' as *;
 
@@ -27,21 +29,21 @@
   // always setting `width: 100%;`. This works because we use `flex` values
   // later on to override this initial width.
   width: 100%;
-  padding-right: ($gutter / 2);
-  padding-left: ($gutter / 2);
+  padding-right: ($gutter * 0.5);
+  padding-left: ($gutter * 0.5);
 
   // For our condensed use-case, our gutters collapse to 2px solid, 1px on each
   // side.
   .#{$prefix}--row--condensed &,
   .#{$prefix}--grid--condensed & {
-    padding-right: ($condensed-gutter / 2);
-    padding-left: ($condensed-gutter / 2);
+    padding-right: ($condensed-gutter * 0.5);
+    padding-left: ($condensed-gutter * 0.5);
   }
 
   // For our narrow use-case, our container hangs 16px into the gutter
   .#{$prefix}--row--narrow &,
   .#{$prefix}--grid--narrow & {
-    padding-right: ($gutter / 2);
+    padding-right: ($gutter * 0.5);
     padding-left: 0;
   }
 }
@@ -61,8 +63,8 @@
     // Add a `max-width` to ensure content within each column does not blow out
     // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
     // do not appear to require this.
-    max-width: percentage($span / $columns);
-    flex: 0 0 percentage($span / $columns);
+    max-width: percentage(math.div($span, $columns));
+    flex: 0 0 percentage(math.div($span, $columns));
   }
 }
 
@@ -72,7 +74,7 @@
 /// @access private
 /// @group @carbon/grid
 @mixin -make-col-offset($span, $columns) {
-  $offset: $span / $columns;
+  $offset: math.div($span, $columns);
   @if $offset == 0 {
     margin-left: 0;
   } @else {
@@ -154,8 +156,8 @@
 @mixin make-row($gutter: $grid-gutter) {
   display: flex;
   flex-wrap: wrap;
-  margin-right: -1 * $gutter / 2;
-  margin-left: -1 * $gutter / 2;
+  margin-right: -1 * $gutter * 0.5;
+  margin-left: -1 * $gutter * 0.5;
 }
 
 // -----------------------------------------------------------------------------
@@ -206,20 +208,20 @@
 /// @group @carbon/grid
 @mixin -hang($gutter: $grid-gutter) {
   .#{$prefix}--hang--start {
-    padding-left: ($gutter / 2);
+    padding-left: ($gutter * 0.5);
   }
 
   .#{$prefix}--hang--end {
-    padding-right: ($gutter / 2);
+    padding-right: ($gutter * 0.5);
   }
 
   // Deprecated ☠️
   .#{$prefix}--hang--left {
-    padding-left: ($gutter / 2);
+    padding-left: ($gutter * 0.5);
   }
 
   .#{$prefix}--hang--right {
-    padding-right: ($gutter / 2);
+    padding-right: ($gutter * 0.5);
   }
 }
 
@@ -246,14 +248,14 @@
       $prev-margin: map-get($prev-breakpoint, margin);
       @if $prev-margin != $margin {
         @include breakpoint($name) {
-          padding-right: #{($grid-gutter / 2) + $margin};
-          padding-left: #{($grid-gutter / 2) + $margin};
+          padding-right: #{($grid-gutter * 0.5) + $margin};
+          padding-left: #{($grid-gutter * 0.5) + $margin};
         }
       }
     } @else {
       @include breakpoint($name) {
-        padding-right: #{($grid-gutter / 2) + $margin};
-        padding-left: #{($grid-gutter / 2) + $margin};
+        padding-right: #{($grid-gutter * 0.5) + $margin};
+        padding-left: #{($grid-gutter * 0.5) + $margin};
       }
     }
   }
@@ -308,13 +310,13 @@
 
   .#{$prefix}--row-padding [class*='#{$prefix}--col'],
   .#{$prefix}--col-padding {
-    padding-top: $grid-gutter / 2;
-    padding-bottom: $grid-gutter / 2;
+    padding-top: $grid-gutter * 0.5;
+    padding-bottom: $grid-gutter * 0.5;
   }
 
   .#{$prefix}--grid--condensed [class*='#{$prefix}--col'] {
-    padding-top: $condensed-gutter / 2;
-    padding-bottom: $condensed-gutter / 2;
+    padding-top: $condensed-gutter * 0.5;
+    padding-bottom: $condensed-gutter * 0.5;
   }
 
   @include -make-grid-columns($breakpoints, $grid-gutter);

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -128,7 +128,7 @@
     "rollup-plugin-strip-banner": "^2.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "rtlcss": "^2.4.0",
-    "sass": "^1.32.2",
+    "sass": "^1.36.0",
     "sass-loader": "^10.1.1",
     "storybook-readme": "^5.0.9",
     "string-replace-loader": "^2.1.0",

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -29,7 +29,7 @@
     "prettier": "^2.2.1",
     "react": "^17.0.1",
     "resolve": "^1.12.0",
-    "sass": "^1.32.4",
+    "sass": "^1.36.0",
     "tabbable": "^4.0.0"
   },
   "devDependencies": {

diff --git a/packages/themes/examples/preview-v11/package.json b/packages/themes/examples/preview-v11/package.json
@@ -11,6 +11,6 @@
     "next": "^10.0.7",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "sass": "^1.32.7"
+    "sass": "^1.36.0"
   }
 }
diff --git a/packages/themes/examples/sass-modules/package.json b/packages/themes/examples/sass-modules/package.json
@@ -8,6 +8,6 @@
     "next": "^10.0.6",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "sass": "^1.32.5"
+    "sass": "^1.36.0"
   }
 }
diff --git a/packages/type/package.json b/packages/type/package.json
@@ -16,7 +16,8 @@
     "lib",
     "scss",
     "src",
-    "umd"
+    "umd",
+    "index.scss"
   ],
   "keywords": [
     "eyeglass-module",

diff --git a/yarn.lock b/yarn.lock
@@ -1736,7 +1736,7 @@ __metadata:
     remark: ^10.0.1
     replace-in-file: ^6.1.0
     rollup: ^2.46.0
-    sass: ^1.32.4
+    sass: ^1.36.0
     sassdoc: ^2.7.3
     yargs: ^15.1.0
   bin:
@@ -2027,7 +2027,7 @@ __metadata:
     rollup: ^2.46.0
     rollup-plugin-strip-banner: ^2.0.0
     rtlcss: ^3.1.2
-    sass: ^1.32.12
+    sass: ^1.36.0
     sass-loader: 10
     style-loader: ^2.0.0
     webpack: ^4.41.5
@@ -2111,7 +2111,7 @@ __metadata:
     react: ^17.0.1
     react-dom: ^16.9.0
     resolve: ^1.12.0
-    sass: ^1.32.4
+    sass: ^1.36.0
     tabbable: ^4.0.0
   peerDependencies:
     node-sass: ^4.13.1
@@ -10383,7 +10383,7 @@ __metadata:
     rollup-plugin-strip-banner: ^2.0.0
     rollup-plugin-terser: ^7.0.2
     rtlcss: ^2.4.0
-    sass: ^1.32.2
+    sass: ^1.36.0
     sass-loader: ^10.1.1
     storybook-readme: ^5.0.9
     string-replace-loader: ^2.1.0
@@ -10524,7 +10524,7 @@ __metadata:
     rollup: ^2.46.0
     rollup-plugin-filesize: ^9.1.1
     rollup-plugin-terser: ^7.0.2
-    sass: ^1.24.5
+    sass: ^1.36.0
     sass-loader: ^8.0.2
     serve-static: ^1.13.0
     style-loader: ^1.1.3
@@ -29825,14 +29825,14 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"sass@npm:^1.24.5, sass@npm:^1.32.12, sass@npm:^1.32.2, sass@npm:^1.32.4":
-  version: 1.32.13
-  resolution: "sass@npm:1.32.13"
+"sass@npm:^1.36.0":
+  version: 1.36.0
+  resolution: "sass@npm:1.36.0"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
   bin:
     sass: sass.js
-  checksum: 51b798280bd96c8e8d580592bcd40947075e9e55109bbc5e21037427ac2a78e58d3c3cf4b8b33ac9d592758376597d15cd28ddde1cda2885d19791d6321989d4
+  checksum: fdb03deed1769f182900c1b5505bc22e50cf1d3ce4d5253fc907865f784c430236937bd391d91ef714e59995584f13ff31d3776d5283e730f5172ac227585754
   languageName: node
   linkType: hard
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,8 @@ @@
         "es",
         "lib",
         "scss",
-        "umd"
+        "umd",
+        "index.scss"
       ],
       "keywords": [
         "eyeglass-module",
@@ Expand Down @@