diff --git a/packages/mdc-typography/_typography.scss b/packages/mdc-typography/_typography.scss index 29f669b3d4c..422a8c2fb44 100644 --- a/packages/mdc-typography/_typography.scss +++ b/packages/mdc-typography/_typography.scss @@ -72,7 +72,7 @@ @return $tracking / ($font-size * 16) * 1em; } -@function pxToRem($px) { +@function px-to-rem($px) { @return $px / 16px * 1rem; } @@ -114,104 +114,104 @@ $styles: set-styles_( $base, ( headline1: ( - font-size: pxToRem(96px), - line-height: pxToRem(96px), + font-size: px-to-rem(96px), + line-height: px-to-rem(96px), font-weight: map.get($font-weight-values, light), letter-spacing: get-letter-spacing_(-1.5, 6), text-decoration: inherit, text-transform: inherit, ), headline2: ( - font-size: pxToRem(60px), - line-height: pxToRem(60px), + font-size: px-to-rem(60px), + line-height: px-to-rem(60px), font-weight: map.get($font-weight-values, light), letter-spacing: get-letter-spacing_(-0.5, 3.75), text-decoration: inherit, text-transform: inherit, ), headline3: ( - font-size: pxToRem(48px), - line-height: pxToRem(50px), + font-size: px-to-rem(48px), + line-height: px-to-rem(50px), font-weight: map.get($font-weight-values, regular), letter-spacing: normal, text-decoration: inherit, text-transform: inherit, ), headline4: ( - font-size: pxToRem(34px), - line-height: pxToRem(40px), + font-size: px-to-rem(34px), + line-height: px-to-rem(40px), font-weight: map.get($font-weight-values, regular), letter-spacing: get-letter-spacing_(0.25, 2.125), text-decoration: inherit, text-transform: inherit, ), headline5: ( - font-size: pxToRem(24px), - line-height: pxToRem(32px), + font-size: px-to-rem(24px), + line-height: px-to-rem(32px), font-weight: map.get($font-weight-values, regular), letter-spacing: normal, text-decoration: inherit, text-transform: inherit, ), headline6: ( - font-size: pxToRem(20px), - line-height: pxToRem(32px), + font-size: px-to-rem(20px), + line-height: px-to-rem(32px), font-weight: map.get($font-weight-values, medium), letter-spacing: get-letter-spacing_(0.25, 1.25), text-decoration: inherit, text-transform: inherit, ), subtitle1: ( - font-size: pxToRem(16px), - line-height: pxToRem(28px), + font-size: px-to-rem(16px), + line-height: px-to-rem(28px), font-weight: map.get($font-weight-values, regular), letter-spacing: get-letter-spacing_(0.15, 1), text-decoration: inherit, text-transform: inherit, ), subtitle2: ( - font-size: pxToRem(14px), - line-height: pxToRem(22px), + font-size: px-to-rem(14px), + line-height: px-to-rem(22px), font-weight: map.get($font-weight-values, medium), letter-spacing: get-letter-spacing_(0.1, 0.875), text-decoration: inherit, text-transform: inherit, ), body1: ( - font-size: pxToRem(16px), - line-height: pxToRem(24px), + font-size: px-to-rem(16px), + line-height: px-to-rem(24px), font-weight: map.get($font-weight-values, regular), letter-spacing: get-letter-spacing_(0.5, 1), text-decoration: inherit, text-transform: inherit, ), body2: ( - font-size: pxToRem(14px), - line-height: pxToRem(20px), + font-size: px-to-rem(14px), + line-height: px-to-rem(20px), font-weight: map.get($font-weight-values, regular), letter-spacing: get-letter-spacing_(0.25, 0.875), text-decoration: inherit, text-transform: inherit, ), caption: ( - font-size: pxToRem(12px), - line-height: pxToRem(20px), + font-size: px-to-rem(12px), + line-height: px-to-rem(20px), font-weight: map.get($font-weight-values, regular), letter-spacing: get-letter-spacing_(0.4, 0.75), text-decoration: inherit, text-transform: inherit, ), button: ( - font-size: pxToRem(14px), - line-height: pxToRem(36px), + font-size: px-to-rem(14px), + line-height: px-to-rem(36px), font-weight: map.get($font-weight-values, medium), letter-spacing: get-letter-spacing_(1.25, 0.875), text-decoration: none, text-transform: uppercase, ), overline: ( - font-size: pxToRem(12px), - line-height: pxToRem(32px), + font-size: px-to-rem(12px), + line-height: px-to-rem(32px), font-weight: map.get($font-weight-values, medium), letter-spacing: get-letter-spacing_(2, 0.75), text-decoration: none,