From fd276fbd99d7118de225c5ea7331a7630d5aced3 Mon Sep 17 00:00:00 2001 From: Edwin Collazos Date: Thu, 16 Jul 2026 13:03:21 -0400 Subject: [PATCH 1/2] Deletes the typography sass code for vdiff tests --- test/sass.scss | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/test/sass.scss b/test/sass.scss index e128c89811c..ab434534f3d 100644 --- a/test/sass.scss +++ b/test/sass.scss @@ -3,34 +3,7 @@ @use "../components/inputs/sass/text.scss"; @use "../components/inputs/sass/textarea.scss"; @use "../components/offscreen/offscreen.scss"; -@use "../components/typography/typography.scss"; -@include typography.d2l-typography-font-face(); - -.d2l-test-body { - @include typography.d2l-typography(); -} -.d2l-test-body-standard { - @include typography.d2l-body-standard(); -} -.d2l-test-body-compact { - @include typography.d2l-body-compact(); -} -.d2l-test-body-small { - @include typography.d2l-body-small(); -} -.d2l-test-heading-1 { - @include typography.d2l-heading-1(); -} -.d2l-test-heading-2 { - @include typography.d2l-heading-2(); -} -.d2l-test-heading-3 { - @include typography.d2l-heading-3(); -} -.d2l-test-heading-4 { - @include typography.d2l-heading-4(); -} .d2l-test-input-radio { @include radio.d2l-input-radio(); } From 8fd9c0789ccc1c40a7ce0797fb1b45dfea5b5c33 Mon Sep 17 00:00:00 2001 From: Edwin Collazos Date: Thu, 16 Jul 2026 13:06:34 -0400 Subject: [PATCH 2/2] Deletes typography.scss file --- components/typography/typography.scss | 200 -------------------------- 1 file changed, 200 deletions(-) delete mode 100644 components/typography/typography.scss diff --git a/components/typography/typography.scss b/components/typography/typography.scss deleted file mode 100644 index c32026bb56b..00000000000 --- a/components/typography/typography.scss +++ /dev/null @@ -1,200 +0,0 @@ -@use "../colors/colors.scss"; - -@mixin d2l-typography { - - color: colors.$d2l-color-ferrite; - display: block; - font-family: "Lato", "Lucida Sans Unicode", "Lucida Grande", sans-serif; - font-size: 0.95rem; - font-weight: 400; - letter-spacing: 0.01rem; - line-height: 1.4rem; - - p { - margin: 1rem 0; - } - - &:lang(ar), - & :lang(ar) { - font-family: "Segoe UI", "Geeza Pro", sans-serif; - } - - &:lang(ja), - & :lang(ja) { - font-family: "Hiragino Kaku Gothic Pro", "Meiyro", sans-serif; - } - - &:lang(ko), - & :lang(ko) { - font-family: "Apple SD Gothic Neo", Dotum, sans-serif; - } - - &:lang(th), - & :lang(th), - &:lang(tha), - & :lang(tha) { - font-family: "Noto Sans Thai", system-ui, Tahoma; - } - - &:lang(zh), - & :lang(zh) { - font-family: "Microsoft YaHei", "Hiragino Sans GB", sans-serif; - } - -} - -@mixin d2l-typography-font-face { - @font-face { - font-family: "Lato"; - font-style: normal; - font-weight: 400; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/Lato-400.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/Lato-400.woff) format("woff"); - } - @font-face { - font-family: "Lato"; - font-style: normal; - font-weight: 700; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/Lato-700.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/Lato-700.woff) format("woff"); - } - @font-face { - font-family: 'Noto Sans Thai'; - font-style: normal; - font-weight: 400; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/NotoSansThai-Regular.woff2) format('woff2'), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/NotoSansThai-Regular.woff) format('woff'); - } - @font-face { - font-family: 'Noto Sans Thai'; - font-style: normal; - font-weight: 700; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/NotoSansThai-Bold.woff2) format('woff2'), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/NotoSansThai-Bold.woff) format('woff'); - } - @font-face { - font-family: "BC Sans"; - font-style: normal; - font-weight: 300; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Light.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Light.woff) format("woff"); - } - @font-face { - font-family: "BC Sans"; - font-style: normal; - font-weight: 400; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Regular.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Regular.woff) format("woff"); - } - @font-face { - font-family: "BC Sans"; - font-style: normal; - font-weight: 700; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Bold.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Bold.woff) format("woff"); - } - @font-face { - font-family: "BC Sans"; - font-style: italic; - font-weight: 300; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-LightItalic.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-LightItalic.woff) format("woff"); - } - @font-face { - font-family: "BC Sans"; - font-style: italic; - font-weight: 400; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Italic.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-Italic.woff) format("woff"); - } - @font-face { - font-family: "BC Sans"; - font-style: italic; - font-weight: 700; - src: - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-BoldItalic.woff2) format("woff2"), - url(https://s.brightspace.com/lib/fonts/0.6.4/assets/BCSans-BoldItalic.woff) format("woff"); - } -} - -@mixin d2l-body-standard { - font-size: 0.95rem; - font-weight: 400; - line-height: 1.4rem; - @media (max-width: 615px) { - font-size: 0.8rem; - line-height: 1.2rem; - } -} - -@mixin d2l-body-compact { - font-size: 0.8rem; - font-weight: 400; - line-height: 1.2rem; -} - -@mixin d2l-body-small { - color: colors.$d2l-color-tungsten; - font-size: 0.7rem; - font-weight: 400; - line-height: 0.9rem; - margin: auto; -} - -@mixin d2l-heading-1 { - font-size: 2rem; - font-weight: 400; - line-height: 2.4rem; - margin: 1.5rem 0 1.5rem 0; - @media (max-width: 615px) { - font-size: 1.5rem; - line-height: 1.8rem; - } -} - -@mixin d2l-heading-2 { - font-size: 1.5rem; - font-weight: 400; - line-height: 1.8rem; - margin: 1.5rem 0 1.5rem 0; - @media (max-width: 615px) { - font-size: 1rem; - font-weight: 700; - line-height: 1.5rem; - } -} - -@mixin d2l-heading-3 { - font-size: 1rem; - font-weight: 700; - line-height: 1.5rem; - margin: 1.5rem 0 1.5rem 0; - @media (max-width: 615px) { - font-size: 0.8rem; - font-weight: 700; - line-height: 1.2rem; - } -} - -@mixin d2l-heading-4 { - font-size: 0.8rem; - font-weight: 700; - line-height: 1.2rem; - margin: 1.5rem 0 1.5rem 0; -} - -@mixin d2l-label-text { - font-size: 0.7rem; - font-weight: 700; - letter-spacing: 0.2px; - line-height: 1rem; -}