From 3ecae7fa4a13b4a8334c727a4a9c91c444fba297 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Wed, 4 Mar 2020 21:25:39 -0600 Subject: [PATCH 1/2] fix(type): update reset to use relative unit --- packages/type/scss/_reset.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/type/scss/_reset.scss b/packages/type/scss/_reset.scss index 01be413af98f..960e5de66fbb 100644 --- a/packages/type/scss/_reset.scss +++ b/packages/type/scss/_reset.scss @@ -10,18 +10,18 @@ @import 'styles'; /// Include a type reset for a given body and mono font family -/// @param {Number} $base-font-size [$carbon--base-font-size] - The base font size for your document /// @param {String} $body-font-family [carbon--font-family('sans')] - The font family used on the `` element /// @param {String} $mono-font-family [carbon--font-family('mono')] - The font family used on elements that require mono fonts, like the `` element /// @access public /// @group @carbon/type @mixin carbon--type-reset( + // TODO: remove in next major release. This has been replaced with 100% $base-font-size: $carbon--base-font-size, $body-font-family: carbon--font-family('sans'), $mono-font-family: carbon--font-family('mono') ) { html { - font-size: $base-font-size; + font-size: 100%; } body { From b6ee81fe1faf3b7030ac5400ccaef17c92fe9a44 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Thu, 5 Mar 2020 12:24:29 -0600 Subject: [PATCH 2/2] chore(format): run prettier --- packages/type/scss/_reset.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/type/scss/_reset.scss b/packages/type/scss/_reset.scss index 960e5de66fbb..bf577a8fc463 100644 --- a/packages/type/scss/_reset.scss +++ b/packages/type/scss/_reset.scss @@ -16,7 +16,7 @@ /// @group @carbon/type @mixin carbon--type-reset( // TODO: remove in next major release. This has been replaced with 100% - $base-font-size: $carbon--base-font-size, + $base-font-size: $carbon--base-font-size, $body-font-family: carbon--font-family('sans'), $mono-font-family: carbon--font-family('mono') ) {