Merge branch 'master' into hotfix/unstable-id-on-dropdown

carbon-design-system · Jan 6, 2020 · d0b4372 · d0b4372
2 parents 6994a05 + 6c1042e
commit d0b4372
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 0 deletions.
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;
 }
 ```

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;
 }
 ```

diff --git a/packages/layout/docs/sass.md b/packages/layout/docs/sass.md
@@ -733,6 +733,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;
 }
 ```
@@ -761,6 +766,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;
 }
 ```

diff --git a/packages/layout/scss/_convert.scss b/packages/layout/scss/_convert.scss
@@ -17,6 +17,11 @@ $carbon--base-font-size: 16px !default;
 /// @access public
 /// @group @carbon/layout
 @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;
 }
 
@@ -26,5 +31,10 @@ $carbon--base-font-size: 16px !default;
 /// @access public
 /// @group @carbon/layout
 @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;
 }