From 50f538c6af52aef7e42d9d924fd4543ea9806ba4 Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Mon, 4 May 2026 15:48:33 -0400 Subject: [PATCH 1/6] remove a whole bunch of scss --- packages/gamut-styles/core/_typography.scss | 36 -------- packages/gamut-styles/core/index.scss | 1 - .../gamut-styles/utils/functions/index.scss | 26 ------ packages/gamut-styles/utils/index.scss | 4 - .../utils/mixins/_font-smoothing.scss | 9 -- .../gamut-styles/utils/mixins/_no-select.scss | 4 - .../utils/mixins/_responsive.scss | 85 ------------------- .../gamut-styles/utils/mixins/_shadow.scss | 19 ----- .../gamut-styles/utils/mixins/_sr-only.scss | 37 -------- packages/gamut-styles/utils/mixins/index.scss | 6 -- .../gamut-styles/utils/mixins/legacy.scss | 48 ----------- .../gamut-styles/utils/variables/_grid.scss | 15 ---- .../utils/variables/_responsive.scss | 1 - .../utils/variables/_typography.scss | 12 +-- .../gamut-styles/utils/variables/index.js | 8 -- .../gamut-styles/utils/variables/index.scss | 2 - .../ButtonDeprecated/styles/index.module.scss | 3 +- .../ButtonDeprecated/styles/mixins.scss | 3 +- .../ButtonDeprecated/styles/variables.scss | 12 +-- .../src/Video/styles/vds_base_theme.scss | 2 +- .../lib/Foundations/Utilities/Utilities.mdx | 68 ++------------- 21 files changed, 22 insertions(+), 379 deletions(-) delete mode 100644 packages/gamut-styles/core/_typography.scss delete mode 100644 packages/gamut-styles/utils/functions/index.scss delete mode 100644 packages/gamut-styles/utils/mixins/_font-smoothing.scss delete mode 100644 packages/gamut-styles/utils/mixins/_no-select.scss delete mode 100644 packages/gamut-styles/utils/mixins/_responsive.scss delete mode 100644 packages/gamut-styles/utils/mixins/_shadow.scss delete mode 100644 packages/gamut-styles/utils/mixins/_sr-only.scss delete mode 100644 packages/gamut-styles/utils/mixins/index.scss delete mode 100644 packages/gamut-styles/utils/mixins/legacy.scss delete mode 100755 packages/gamut-styles/utils/variables/_grid.scss delete mode 100644 packages/gamut-styles/utils/variables/_responsive.scss delete mode 100644 packages/gamut-styles/utils/variables/index.js diff --git a/packages/gamut-styles/core/_typography.scss b/packages/gamut-styles/core/_typography.scss deleted file mode 100644 index fc466283395..00000000000 --- a/packages/gamut-styles/core/_typography.scss +++ /dev/null @@ -1,36 +0,0 @@ -// https://raw.githubusercontent.com/twbs/bootstrap/v4-dev/scss/_type.scss - -h1, -h2, -h3, -h4, -h5, -h6 { - margin-bottom: $margin-bottom-headings; - font-weight: $font-weight-headings; - line-height: $line-height-headings; -} - -h1 { - font-size: $font-size-h1; -} -h2 { - font-size: $font-size-h2; -} -h3 { - font-size: $font-size-h3; -} -h4 { - font-size: $font-size-h4; -} -h5 { - font-size: $font-size-h5; -} -h6 { - font-size: $font-size-h6; -} - -small { - font-size: $font-size-small; - font-weight: $font-weight-normal; -} diff --git a/packages/gamut-styles/core/index.scss b/packages/gamut-styles/core/index.scss index 6dc3ab28275..c1e329bd9f3 100644 --- a/packages/gamut-styles/core/index.scss +++ b/packages/gamut-styles/core/index.scss @@ -1,4 +1,3 @@ @forward "../utils"; @forward "reboot"; @forward "fonts"; -@forward "typography"; diff --git a/packages/gamut-styles/utils/functions/index.scss b/packages/gamut-styles/utils/functions/index.scss deleted file mode 100644 index c3ac6ae3a85..00000000000 --- a/packages/gamut-styles/utils/functions/index.scss +++ /dev/null @@ -1,26 +0,0 @@ -@use "sass:math"; - -@function strip-units($number) { - @return math.div($number, ($number * 0 + 1)); -} - -@function px-rem($px, $base-px: 16) { - @return calc(strip-units($px) / strip-units($base-px)) * 1rem; -} - -@function px-em($px, $base-px: 16) { - @return calc(strip-units($px) / strip-units($base-px)) * 1em; -} - -// Math -@function pow($number, $exponent) { - $value: 1; - - @if $exponent > 0 { - @for $i from 1 through $exponent { - $value: $value * $number; - } - } - - @return $value; -} diff --git a/packages/gamut-styles/utils/index.scss b/packages/gamut-styles/utils/index.scss index 40fe2ffb32e..1145896a0f2 100644 --- a/packages/gamut-styles/utils/index.scss +++ b/packages/gamut-styles/utils/index.scss @@ -1,5 +1 @@ -// import order is unfortunately important here -// variables needs to access functions, and mixins needs to access variables -@forward "functions/index"; @forward "variables/index"; -@forward "mixins/index"; diff --git a/packages/gamut-styles/utils/mixins/_font-smoothing.scss b/packages/gamut-styles/utils/mixins/_font-smoothing.scss deleted file mode 100644 index 254bcf9b06e..00000000000 --- a/packages/gamut-styles/utils/mixins/_font-smoothing.scss +++ /dev/null @@ -1,9 +0,0 @@ -@mixin font-smoothing($value: on) { - @if $value == on { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } @else { - -webkit-font-smoothing: subpixel-antialiased; - -moz-osx-font-smoothing: auto; - } -} diff --git a/packages/gamut-styles/utils/mixins/_no-select.scss b/packages/gamut-styles/utils/mixins/_no-select.scss deleted file mode 100644 index 4dc5460719e..00000000000 --- a/packages/gamut-styles/utils/mixins/_no-select.scss +++ /dev/null @@ -1,4 +0,0 @@ -@mixin no-select { - -webkit-touch-callout: none; - user-select: none; -} diff --git a/packages/gamut-styles/utils/mixins/_responsive.scss b/packages/gamut-styles/utils/mixins/_responsive.scss deleted file mode 100644 index 448dc1e4158..00000000000 --- a/packages/gamut-styles/utils/mixins/_responsive.scss +++ /dev/null @@ -1,85 +0,0 @@ -// Try to use these simple mixins if possible for your responsive needs -@use "../variables/grid" as *; - -// Example usage: -// -// .grid { -// display: flex; -// flex-direction: column; -// @include md-viewport { -// flex-direction: row; -// } -// } - -@mixin sm-viewport { - @media only screen and (min-width: $grid-sm-min) { - @content; - } -} - -@mixin md-viewport { - @media only screen and (min-width: $grid-md-min) { - @content; - } -} - -@mixin lg-viewport { - @media only screen and (min-width: $grid-lg-min) { - @content; - } -} - -@mixin xl-viewport { - @media only screen and (min-width: $grid-xl-min) { - @content; - } -} - -// Media query abstractions if you need more complex responsive behavior -// or custom breakpoints - -@mixin screen-size-lte($max) { - @media screen and (max-width: $max) { - @content; - } -} - -@mixin screen-size-between($min, $max) { - @media screen and (min-width: $min) and (max-width: $max) { - @content; - } -} - -@mixin screen-size-gte($min) { - @media screen and (min-width: $min) { - @content; - } -} - -// Named view port mixin - -@mixin getViewport($viewport) { - @if $viewport == "xl" { - @include xl-viewport() { - @content; - } - } - @if $viewport == "lg" { - @include lg-viewport { - @content; - } - } - @if $viewport == "md" { - @include md-viewport { - @content; - } - } - @if $viewport == "sm" { - @include sm-viewport { - @content; - } - } - @if $viewport == "xs" { - @content; - } -} diff --git a/packages/gamut-styles/utils/mixins/_shadow.scss b/packages/gamut-styles/utils/mixins/_shadow.scss deleted file mode 100644 index 9bf527d9e35..00000000000 --- a/packages/gamut-styles/utils/mixins/_shadow.scss +++ /dev/null @@ -1,19 +0,0 @@ -// depth based box-shadows - -@mixin shadow($depth: 1) { - @if $depth == 1 { - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); - } - @if $depth == 2 { - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); - } - @if $depth == 3 { - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); - } - @if $depth == 4 { - box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); - } - @if $depth == 5 { - box-shadow: 0 19px 38px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22); - } -} diff --git a/packages/gamut-styles/utils/mixins/_sr-only.scss b/packages/gamut-styles/utils/mixins/_sr-only.scss deleted file mode 100644 index e5a321f3f3d..00000000000 --- a/packages/gamut-styles/utils/mixins/_sr-only.scss +++ /dev/null @@ -1,37 +0,0 @@ -// shamelessly stolen from bootstrap -// https://github.com/twbs/bootstrap/blob/2085c142679563189dbc34ec6bf4b00e32b8f615/scss/mixins/_screen-reader.scss - -@mixin screenreader-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - overflow: hidden; - clip: rect(0, 0, 0, 0); - white-space: nowrap; - clip-path: inset(50%); - border: 0; -} - -@mixin sr-only { - @warn "This is deprecated, please use screenreader-only"; - @include screenreader-only; -} - -@mixin screenreader-only-focusable { - &:active, - &:focus { - position: static; - width: auto; - height: auto; - overflow: visible; - clip: auto; - white-space: normal; - clip-path: none; - } -} - -@mixin sr-only-focusable { - @warn "This is deprecated, please use screenreader-only-focusable"; - @include screenreader-only-focusable; -} diff --git a/packages/gamut-styles/utils/mixins/index.scss b/packages/gamut-styles/utils/mixins/index.scss deleted file mode 100644 index 97ed010fff6..00000000000 --- a/packages/gamut-styles/utils/mixins/index.scss +++ /dev/null @@ -1,6 +0,0 @@ -@forward "font-smoothing"; -@forward "no-select"; -@forward "responsive"; -@forward "shadow"; -@forward "sr-only"; -@forward "legacy"; diff --git a/packages/gamut-styles/utils/mixins/legacy.scss b/packages/gamut-styles/utils/mixins/legacy.scss deleted file mode 100644 index e0bf22eff9e..00000000000 --- a/packages/gamut-styles/utils/mixins/legacy.scss +++ /dev/null @@ -1,48 +0,0 @@ -// Legacy Helper mixins -@use "../variables/index.scss"; -@use "../mixins/responsive" as *; - -// these variables should be located in ../variables -// instead, they're co-located with their legacy functions so they can be removed more easily -// NOTE: when removing, also remove the legacyBreakpoints JS object in gamut-styles/variables.js -$bp-phone: 0; -$bp-tablet: 736px; -$bp-desktop: 960px; - -@mixin device-phone { - @include screen-size-between($bp-phone, $bp-tablet - 1) { - @content; - } -} - -@mixin device-tablet { - @include screen-size-between($bp-tablet, $bp-desktop - 1) { - @content; - } -} - -@mixin device-desktop { - @include screen-size-gte($bp-desktop) { - @content; - } -} - -@mixin devices($devices...) { - @each $device in $devices { - @if $device == phone { - @include device-phone { - @content; - } - } - @if $device == tablet { - @include device-tablet { - @content; - } - } - @if $device == desktop { - @include device-desktop { - @content; - } - } - } -} diff --git a/packages/gamut-styles/utils/variables/_grid.scss b/packages/gamut-styles/utils/variables/_grid.scss deleted file mode 100755 index cded5f51b31..00000000000 --- a/packages/gamut-styles/utils/variables/_grid.scss +++ /dev/null @@ -1,15 +0,0 @@ -// Overrides for the Grid component -@use "../functions/index.scss" as *; - -// NOTE: When updating, make sure you also update the gamut-styles/variables.js file - -$max-content-width: 1440px; - -$grid-cols: 12; -$grid-gutter-width: px-rem(16); -$grid-outer-margin: px-rem(16); -$grid-xs-min: px-rem(480); -$grid-sm-min: px-rem(768); -$grid-md-min: px-rem(1024); -$grid-lg-min: px-rem(1200); -$grid-xl-min: px-rem($max-content-width); diff --git a/packages/gamut-styles/utils/variables/_responsive.scss b/packages/gamut-styles/utils/variables/_responsive.scss deleted file mode 100644 index 933735a2c18..00000000000 --- a/packages/gamut-styles/utils/variables/_responsive.scss +++ /dev/null @@ -1 +0,0 @@ -$screenSizes: ("xs", "sm", "md", "lg", "xl"); diff --git a/packages/gamut-styles/utils/variables/_typography.scss b/packages/gamut-styles/utils/variables/_typography.scss index 2343cba33a2..213df4d508f 100644 --- a/packages/gamut-styles/utils/variables/_typography.scss +++ b/packages/gamut-styles/utils/variables/_typography.scss @@ -47,10 +47,10 @@ $line-height-headings: 1.1; // Font sizes $font-size-base: base.$base-unit; -$font-size-h1: px-rem(64); -$font-size-h2: px-rem(44); -$font-size-h3: px-rem(34); -$font-size-h4: px-rem(26); -$font-size-h5: px-rem(22); -$font-size-h6: px-rem(20); +$font-size-h1: 4rem; +$font-size-h2: 2.75rem; +$font-size-h3: 2.125rem; +$font-size-h4: 1.625rem; +$font-size-h5: 1.375rem; +$font-size-h6: 1.25rem; $font-size-small: 85%; diff --git a/packages/gamut-styles/utils/variables/index.js b/packages/gamut-styles/utils/variables/index.js deleted file mode 100644 index 88af9701f32..00000000000 --- a/packages/gamut-styles/utils/variables/index.js +++ /dev/null @@ -1,8 +0,0 @@ -if (process.env.NODE_ENV === 'development') { - // eslint-disable-next-line no-console - console.warn( - 'Importing from `gamut-styles/utils/variables` is now deprecated, please import directly from the gamut-styles package' - ); -} - -export * from '../../dist/variables'; diff --git a/packages/gamut-styles/utils/variables/index.scss b/packages/gamut-styles/utils/variables/index.scss index 6edb4e9ddd6..bd7c8ef4530 100644 --- a/packages/gamut-styles/utils/variables/index.scss +++ b/packages/gamut-styles/utils/variables/index.scss @@ -1,5 +1,3 @@ @forward "colors"; @forward "base"; -@forward "grid"; @forward "typography"; -@forward "responsive"; diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss index 6eae8bfe237..7558af33ec5 100644 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss @@ -11,7 +11,8 @@ display: inline-flex; justify-content: center; font-weight: variables.$btn-font-weight; - @include font-smoothing; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; border: 1px solid transparent; border-radius: variables.$btn-border-radius; user-select: none; diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss index dd4110529d1..1e9b7431199 100644 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss @@ -98,7 +98,8 @@ } .link-#{$name} { font-weight: bold; - @include font-smoothing; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; color: $background; text-decoration: underline; diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss index ebdba8f9170..40689a0ab57 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss @@ -1,6 +1,6 @@ @use "~@codecademy/gamut-styles/utils" as *; -$btn-padding-x: px-rem(16) !default; +$btn-padding-x: 1rem !default; $btn-padding-y: 0.375rem !default; $btn-font-weight: bold !default; @@ -8,18 +8,18 @@ $btn-line-height: 1.5 !default; $btn-line-height-lg: calc(4 / 3) !default; $btn-line-height-sm: 1.5 !default; -$btn-font-size-base: px-rem(16) !default; -$btn-font-size-lg: px-rem(20) !default; -$btn-font-size-sm: px-rem(16) !default; +$btn-font-size-base: 1rem !default; +$btn-font-size-lg: 1.25rem !default; +$btn-font-size-sm: 1rem !default; $btn-font-size-xs: 0.75rem !default; $btn-padding-x-sm: 0.75rem !default; $btn-padding-y-sm: 0.25rem !default; -$btn-min-width-sm: px-rem(128) !default; +$btn-min-width-sm: 8rem !default; $btn-padding-x-lg: 1.25rem !default; $btn-padding-y-lg: 0.75rem !default; -$btn-min-width-lg: px-rem(160) !default; +$btn-min-width-lg: 10rem !default; $btn-border-radius: 2px !default; $btn-round-border-radius: 50px !default; diff --git a/packages/gamut/src/Video/styles/vds_base_theme.scss b/packages/gamut/src/Video/styles/vds_base_theme.scss index 0432294ee07..ada9d234369 100644 --- a/packages/gamut/src/Video/styles/vds_base_theme.scss +++ b/packages/gamut/src/Video/styles/vds_base_theme.scss @@ -26,7 +26,7 @@ iframe.vds-youtube[data-no-controls] { } :where(.vds-video-layout[data-sm]) :where(.vds-button) { - padding: 0px px-rem(4px) !important; + padding: 0px 4px !important; } // Small layout volume / time slider diff --git a/packages/styleguide/src/lib/Foundations/Utilities/Utilities.mdx b/packages/styleguide/src/lib/Foundations/Utilities/Utilities.mdx index ff66c8a70dd..b9bbb18fa28 100644 --- a/packages/styleguide/src/lib/Foundations/Utilities/Utilities.mdx +++ b/packages/styleguide/src/lib/Foundations/Utilities/Utilities.mdx @@ -29,7 +29,7 @@ it is better to express this as a pixel value that is closer to a round number. You can do this by using our px => rem utility in both TS and SCSS. -#### TS - `pxRem` +#### `pxRem` ```tsx import { pxRem } from '@codecademy/gamut-styles'; @@ -38,16 +38,6 @@ pxRem(16); // => 1rem; pxRem('30px'); // => 1.875rem; ``` -#### SCSS - `px-rem` - -```scss -@use '@codecademy/gamut-styles/utils'; - -.heading { - font-size: px-rem(30); -} -``` - ## Style mixins We also support various style partials to help you consistently achieve affects, like box shadows and screen reader content. @@ -58,7 +48,7 @@ We have 5 depths of box shadows that we use. -#### TS - `boxShadow` +#### `boxShadow` ```tsx import { boxShadow } from '@codecademy/gamut-styles'; @@ -68,21 +58,11 @@ const Example = ` `; ``` -#### SCSS - `box-shadow` - -```scss -@use '@codecademy/gamut-styles/utils'; - -.box { - @include box-shadow(3); -} -``` - ### `fontSmoothing` We enable font smoothing in some places to make typography more readable. -#### TS - `fontSmoothing` +#### `fontSmoothing` ```tsx import { fontSmoothing } from '@codecademy/gamut-styles'; @@ -98,25 +78,11 @@ const Smooth = ` `; ``` -#### SCSS - `font-smoothing` - -```scss -@use '@codecademy/gamut-styles/utils'; - -.smoothed { - @include font-smoothing(); -} - -.rough { - @include font-smoothing(false); -} -``` - ### No selection In cases where we want to prevent the user from selecting an image or text. -#### TS - `noSelect` +#### `noSelect` ```tsx import { noSelect } from '@codecademy/gamut-styles'; @@ -126,23 +92,13 @@ const Unselectable = styled.div` `; ``` -#### SCSS - `no-select` - -```scss -@use '@codecademy/gamut-styles/utils'; - -.unselectable { - @include font-smoothing(); -} -``` - ### Screen readers Ensuring that your content is accessible can require you to make screen reader only text elements. We provide a few helpful mixins for use cases where you want the screen reader to be able to focus or just be aware of the content. -#### TS - `screenReaderOnly` | `screenReaderOnlyFocusable` +#### `screenReaderOnly` | `screenReaderOnlyFocusable` ```tsx import { @@ -158,17 +114,3 @@ const HiddenLabelWithFocus = ` ${screenReaderOnlyFocusable} `; ``` - -#### SCSS - `screenreader-only` | `screenreader-only-focusable` - -```scss -@use '@codecademy/gamut-styles/utils'; - -.hiddenLabel { - @include screenreader-only(); -} - -.hiddenLabel__focusable { - @include screenreader-only-focusable(); -} -``` From bb401e453830a31592c251e8e42eb0bd3eab028d Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Mon, 4 May 2026 15:54:42 -0400 Subject: [PATCH 2/6] fix --- packages/gamut/src/AccordionButtonDeprecated/styles.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss index 489c3359c10..2faea8efbec 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss @@ -40,7 +40,7 @@ margin-left: 1rem; } - @include md-viewport { + @media only screen and (min-width: 64rem) { font-size: 1.75rem; } } From 00e12d139f7d9de920ce7aa1ccd74130ae096af7 Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Wed, 6 May 2026 14:52:00 -0400 Subject: [PATCH 3/6] remove rest of scss variables --- packages/gamut-styles/README.md | 15 - packages/gamut-styles/core/_reboot.scss | 35 +- packages/gamut-styles/core/index.scss | 1 - packages/gamut-styles/utils.scss | 1 - packages/gamut-styles/utils/index.scss | 1 - .../gamut-styles/utils/variables/_base.scss | 7 - .../gamut-styles/utils/variables/_colors.scss | 302 ------------------ .../utils/variables/_typography.scss | 56 ---- .../gamut-styles/utils/variables/index.scss | 3 - .../ButtonDeprecated/styles/index.module.scss | 7 +- .../ButtonDeprecated/styles/mixins.scss | 7 +- .../ButtonDeprecated/styles/variables.scss | 32 +- .../styles.module.scss | 10 +- .../src/Typography/styles/_variables.scss | 54 ---- 14 files changed, 45 insertions(+), 486 deletions(-) delete mode 100644 packages/gamut-styles/utils.scss delete mode 100644 packages/gamut-styles/utils/index.scss delete mode 100644 packages/gamut-styles/utils/variables/_base.scss delete mode 100644 packages/gamut-styles/utils/variables/_colors.scss delete mode 100644 packages/gamut-styles/utils/variables/_typography.scss delete mode 100644 packages/gamut-styles/utils/variables/index.scss delete mode 100644 packages/gamut/src/Typography/styles/_variables.scss diff --git a/packages/gamut-styles/README.md b/packages/gamut-styles/README.md index a90586b56d5..1be7a4aa4ba 100644 --- a/packages/gamut-styles/README.md +++ b/packages/gamut-styles/README.md @@ -2,22 +2,7 @@ Base SCSS for Codecademy -## Variables/ - -This folder houses all shared SCSS style variables. -It also contains a JavaScript file with color variables. - ## Core/ This folder contains a base stylesheet for the app. This should be imported **once** in your application. - -## Utils/ - -This folder contains Sass functions (pure utilities with no stylesheet output values) and mixins (outputs CSS) -to be used as needed both in Gamut and across the Codecademy app. - -The `utils.scss` and `core.scss` just import the index files from their respective folders, to make the syntax to import them from elsewhere easier, e.g.: - -`@use "~@codecademy/gamut-styles/utils";` -`@use "~@codecademy/gamut-styles/core";` diff --git a/packages/gamut-styles/core/_reboot.scss b/packages/gamut-styles/core/_reboot.scss index 93fb9c231e3..b4458df628f 100644 --- a/packages/gamut-styles/core/_reboot.scss +++ b/packages/gamut-styles/core/_reboot.scss @@ -61,12 +61,14 @@ section { body { margin: 0; // 1 - font-family: $font-family-base; - font-weight: $font-weight-base; - line-height: $line-height-base; - color: $color-body; + font-family: "Apercu", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", + "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", + sans-serif; + font-weight: normal; + line-height: 1.5; + color: #10162f; text-align: left; // 3 - background-color: $bg-body; // 2 + background-color: #ffffff; // 2 } // Suppress the focus outline on elements that cannot be accessed via keyboard. @@ -105,7 +107,7 @@ h4, h5, h6 { margin-top: 0; - margin-bottom: $margin-bottom-headings; + margin-bottom: 1rem; } // stylelint-enable selector-list-comma-newline-after @@ -115,7 +117,7 @@ h6 { // bottom margin to use `rem` units instead of `em`. p { margin-top: 0; - margin-bottom: $margin-bottom-paragraph; + margin-bottom: 1rem; } // Abbreviations @@ -155,7 +157,7 @@ ul ol { } dt { - font-weight: $font-weight-dt; + font-weight: bold; } dd { @@ -174,12 +176,12 @@ dfn { // stylelint-disable font-weight-notation b, strong { - font-weight: $font-weight-bold; // Add the correct font weight in Chrome, Edge, and Safari + font-weight: bold; // Add the correct font weight in Chrome, Edge, and Safari } // stylelint-enable font-weight-notation small { - font-size: $font-size-small; // Add the correct font size in all browsers + font-size: 85%; // Add the correct font size in all browsers } // @@ -207,13 +209,13 @@ sup { // a { - color: $color-link; - text-decoration: $decoration-link; + color: #4b35ef; + text-decoration: none; background-color: transparent; // Remove the gray background on active links in IE 10. -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+. &:hover { - text-decoration: $hover-decoration-link; + text-decoration: underline; } } @@ -295,9 +297,8 @@ table { } caption { - padding-top: $spacer; - padding-bottom: $spacer; - color: $spacer; + padding-top: 1rem; + padding-bottom: 1rem; text-align: left; caption-side: bottom; } @@ -315,7 +316,7 @@ th { label { // Allow labels to use `margin` for spacing. display: inline-block; - margin-bottom: $margin-bottom-label; + margin-bottom: 0; } // Remove the default `border-radius` that macOS Chrome adds. diff --git a/packages/gamut-styles/core/index.scss b/packages/gamut-styles/core/index.scss index c1e329bd9f3..65f3a5422f7 100644 --- a/packages/gamut-styles/core/index.scss +++ b/packages/gamut-styles/core/index.scss @@ -1,3 +1,2 @@ -@forward "../utils"; @forward "reboot"; @forward "fonts"; diff --git a/packages/gamut-styles/utils.scss b/packages/gamut-styles/utils.scss deleted file mode 100644 index 28481da2ac0..00000000000 --- a/packages/gamut-styles/utils.scss +++ /dev/null @@ -1 +0,0 @@ -@forward "utils/index"; diff --git a/packages/gamut-styles/utils/index.scss b/packages/gamut-styles/utils/index.scss deleted file mode 100644 index 1145896a0f2..00000000000 --- a/packages/gamut-styles/utils/index.scss +++ /dev/null @@ -1 +0,0 @@ -@forward "variables/index"; diff --git a/packages/gamut-styles/utils/variables/_base.scss b/packages/gamut-styles/utils/variables/_base.scss deleted file mode 100644 index f7e29b6aaa7..00000000000 --- a/packages/gamut-styles/utils/variables/_base.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use "colors" as *; - -$base-unit: 1rem; -$spacer: $base-unit; -$box-shadow: 0 1px 4px 0 $color-shadow; -$box-shadow-hovered: 0 4px 10px 0 $color-shadow; -$height-header: 4rem; diff --git a/packages/gamut-styles/utils/variables/_colors.scss b/packages/gamut-styles/utils/variables/_colors.scss deleted file mode 100644 index 71b931f762e..00000000000 --- a/packages/gamut-styles/utils/variables/_colors.scss +++ /dev/null @@ -1,302 +0,0 @@ -// NOTE: These are actively being deprecated. Use with caution. - -@use "sass:color"; -// ======================================= -// STANDARD COLORS -// ======================================= - -$color-beige: #fff0e5; -$color-light-blue: #66c4ff; -$color-blue: #1557ff; -$color-green: #088a27; -$color-light-green: #aee938; -$color-navy: #10162f; -$color-orange: #ff8c00; -$color-pink: #f966ff; -$color-red: #e91c11; -$color-yellow: #ffd300; -$color-hyper: #3a10e5; -$color-pale-blue: #f5fcff; -$color-pale-green: #f5ffe3; -$color-pale-pink: #fff5ff; -$color-pale-yellow: #fffae5; - -// ======================================= -// INTERACTIVE COLORS -// ======================================= - -$color-interactive-dark: $color-hyper; -$color-interactive-light: $color-yellow; - -// ======================================= -// OTHER COLORS -// ======================================= - -$color-white: #ffffff; -$color-black: #000000; -$color-shadow: rgba($color-black, 0.15); - -// ======================================= -// PLATFORM COLORS -// ======================================= - -$platform-mint-500: #37c3be; - -$platform-mint-600: color.mix($color-black, $platform-mint-500, 20%); -$platform-mint-700: color.mix($color-black, $platform-mint-500, 40%); - -$platform-purple-500: #69639a; - -$platform-purple-200: color.mix($color-white, $platform-purple-500, 60%); -$platform-purple-300: color.mix($color-white, $platform-purple-500, 40%); -$platform-purple-400: color.mix($color-white, $platform-purple-500, 20%); -$platform-purple-600: color.mix($color-black, $platform-purple-500, 20%); -$platform-purple-700: color.mix($color-black, $platform-purple-500, 40%); -$platform-purple-800: color.mix($color-black, $platform-purple-500, 60%); -$platform-purple-900: color.mix($color-black, $platform-purple-500, 80%); - -// ======================================= -// EDITOR COLORS -// ======================================= - -$color-editor-blue: #83fff5; -$color-editor-deep-purple: #cc7bc2; -$color-editor-gray: #939598; -$color-editor-green: #b4d353; -$color-editor-orange: #ff8973; -$color-editor-purple: #b3ccff; -$color-editor-red: #ea6c8b; -$color-editor-yellow: #ffe083; - -// ======================================= -// LEGACY COLOR SWATCHES -// ======================================= - -$color-blue-100: #c8d7fa; -$color-blue-200: #a5befa; -$color-blue-300: #7da2fa; -$color-blue-400: #5788fa; -$color-blue-500: #3069f0; -$color-blue-600: #2d5dcc; -$color-blue-700: #2e4a99; -$color-blue-800: #233466; -$color-blue-900: #141c3a; -$color-blue-1000: #10162f; -$color-blue-1100: #0a0e1d; - -$color-pink-100: #ffd9fc; -$color-pink-200: #ffbffa; -$color-pink-300: #ffa6f8; -$color-pink-400: #f288e9; -$color-pink-500: #d957d9; -$color-pink-600: #b035c9; -$color-pink-700: #9129a6; -$color-pink-800: #702080; -$color-pink-900: #43134d; - -$color-purple-100: #d5ccff; -$color-purple-200: #c0b6f2; -$color-purple-300: #ac9df2; -$color-purple-400: #917ef2; -$color-purple-500: #7c5ce6; -$color-purple-600: #6437cc; -$color-purple-700: #4b2999; -$color-purple-800: #381f73; -$color-purple-900: #231347; - -$color-red-100: #ffd3cc; -$color-red-200: #ffb8ad; -$color-red-300: #ff988c; -$color-red-400: #ff7566; -$color-red-500: #fd4d3f; -$color-red-600: #e53935; -$color-red-700: #bf2e2c; -$color-red-800: #992523; -$color-red-900: #661917; - -$color-green-100: #bbfae5; -$color-green-200: #91f2d2; -$color-green-300: #6aebc0; -$color-green-400: #4fe0b0; -$color-green-500: #47cca0; -$color-green-600: #3eb38c; -$color-green-700: #318c6e; -$color-green-800: #246650; -$color-green-900: #164032; - -$color-orange-100: #ffe9c8; -$color-orange-200: #ffd093; -$color-orange-300: #ffb764; -$color-orange-400: #ff9f3c; -$color-orange-500: #ff881d; -$color-orange-600: #fb7106; -$color-orange-700: #dc5a03; -$color-orange-800: #ba4604; -$color-orange-900: #963606; - -$color-yellow-100: #fff7cc; -$color-yellow-200: #fff2b3; -$color-yellow-300: #ffec8c; -$color-yellow-400: #ffe359; -$color-yellow-500: #ffd500; -$color-yellow-600: #ffb92e; -$color-yellow-700: #e69729; -$color-yellow-800: #b37620; -$color-yellow-900: #805417; - -$color-gray-100: #f6f5fa; -$color-gray-200: #dddce0; -$color-gray-300: #c4c3c7; -$color-gray-400: #a2a2a6; -$color-gray-500: #828285; -$color-gray-600: #646466; -$color-gray-700: #4b4b4d; -$color-gray-800: #323233; -$color-gray-900: #19191a; - -$color-royal-blue: #6400e4; - -// ======================================= -// BRAND COLORS -// ======================================= - -$brand-red: $color-red-500; -$brand-yellow: $color-yellow-500; -$brand-orange: $color-orange-400; -$brand-purple: $color-royal-blue; -$brand-pink: $color-pink-400; -$brand-mint: $color-green-300; -$brand-magenta: $color-pink-700; -$brand-beige: #efd9ca; -$brand-blue: $color-blue-500; -$brand-dark-blue: $color-blue-900; -$brand-lavender: $color-purple-500; - -$deprecated-color-white: #ffffff; -$deprecated-color-black: #000000; - -$deprecated-gamut-purple-500: #69639a; - -$deprecated-gamut-purple-100: color.mix( - $color-white, - $deprecated-gamut-purple-500, - 80% -); -$deprecated-gamut-purple-200: color.mix( - $color-white, - $deprecated-gamut-purple-500, - 60% -); -$deprecated-gamut-purple-300: color.mix( - $color-white, - $deprecated-gamut-purple-500, - 40% -); -$deprecated-gamut-purple-400: color.mix( - $color-white, - $deprecated-gamut-purple-500, - 20% -); -$deprecated-gamut-purple-600: color.mix( - $color-black, - $deprecated-gamut-purple-500, - 20% -); -$deprecated-gamut-purple-700: color.mix( - $color-black, - $deprecated-gamut-purple-500, - 40% -); -$deprecated-gamut-purple-800: color.mix( - $color-black, - $deprecated-gamut-purple-500, - 60% -); -$deprecated-gamut-purple-900: color.mix( - $color-black, - $deprecated-gamut-purple-500, - 80% -); - -$deprecated-gamut-royal-blue-500: #4b35ef; - -$deprecated-gamut-royal-blue-600: color.mix( - $color-black, - $deprecated-gamut-royal-blue-500, - 20% -); -$deprecated-gamut-royal-blue-700: color.mix( - $color-black, - $deprecated-gamut-royal-blue-500, - 40% -); -$deprecated-gamut-royal-blue-800: color.mix( - $color-black, - $deprecated-gamut-royal-blue-500, - 60% -); - -$deprecated-gamut-mint-500: #37c3be; - -$deprecated-gamut-mint-100: color.mix( - $color-white, - $deprecated-gamut-mint-500, - 80% -); -$deprecated-gamut-mint-200: color.mix( - $color-white, - $deprecated-gamut-mint-500, - 60% -); -$deprecated-gamut-mint-300: color.mix( - $color-white, - $deprecated-gamut-mint-500, - 40% -); -$deprecated-gamut-mint-400: color.mix( - $color-white, - $deprecated-gamut-mint-500, - 20% -); -$deprecated-gamut-mint-600: color.mix( - $color-black, - $deprecated-gamut-mint-500, - 20% -); -$deprecated-gamut-mint-700: color.mix( - $color-black, - $deprecated-gamut-mint-500, - 40% -); -$deprecated-gamut-mint-800: color.mix( - $color-black, - $deprecated-gamut-mint-500, - 60% -); -$deprecated-gamut-mint-900: color.mix( - $color-black, - $deprecated-gamut-mint-500, - 80% -); - -$deprecated-gamut-purple: $deprecated-gamut-purple-500; -$deprecated-gamut-royal-blue: $deprecated-gamut-royal-blue-500; -$deprecated-gamut-mint: $deprecated-gamut-mint-500; - -$deprecated-color-grey-1: #e9eaea; -$deprecated-color-grey-2: #d4d5d6; -$deprecated-color-grey-3: #bebfc1; -$deprecated-color-grey-4: #939598; -$deprecated-color-grey-5: #3e3e40; -$deprecated-color-blue: #52b1db; -$deprecated-color-mint: #34b3a0; -$deprecated-color-red: #f65a5b; - -$deprecated-swatches-cc-blue-500: #225470; -$deprecated-swatches-cc-blue-700: #204056; - -$deprecated-swatches-grey-blue-500: #57646e; -$deprecated-swatches-grey-blue-600: #354551; - -$deprecated-swatches-mint-700: #34b3a0; -$deprecated-swatches-mint-800: #1a7b72; diff --git a/packages/gamut-styles/utils/variables/_typography.scss b/packages/gamut-styles/utils/variables/_typography.scss deleted file mode 100644 index 213df4d508f..00000000000 --- a/packages/gamut-styles/utils/variables/_typography.scss +++ /dev/null @@ -1,56 +0,0 @@ -@use "base"; -@use "colors"; - -// Font Families: - -$font-family-accent: "Suisse", "Apercu", -apple-system, BlinkMacSystemFont, - "Segoe UI", "Roboto", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", - "Helvetica Neue", sans-serif; - -$font-family-base: "Apercu", -apple-system, BlinkMacSystemFont, "Segoe UI", - "Roboto", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", - sans-serif; - -$font-monospace: Monaco, Menlo, "Ubuntu Mono", "Droid Sans Mono", Consolas, - monospace; - -$font-system: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Ubuntu", - "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - -// Font Weights - -$font-weight-light: 300; -$font-weight-normal: normal; -$font-weight-bold: bold; -$font-weight-base: $font-weight-normal; -$font-weight-headings: $font-weight-bold; -$font-weight-dt: $font-weight-bold; - -// Font colors - -$color-body: colors.$color-navy; -$color-headings: colors.$color-gray-900; -$bg-body: colors.$color-white; -$color-link: colors.$deprecated-gamut-royal-blue-500; -$hover-color-link: colors.$deprecated-gamut-royal-blue-600; -$decoration-link: none; -$hover-decoration-link: underline; - -// Font margins - -$margin-bottom-paragraph: base.$spacer; -$margin-bottom-headings: base.$spacer; -$margin-bottom-label: 0; -$line-height-base: 1.5; -$line-height-headings: 1.1; - -// Font sizes - -$font-size-base: base.$base-unit; -$font-size-h1: 4rem; -$font-size-h2: 2.75rem; -$font-size-h3: 2.125rem; -$font-size-h4: 1.625rem; -$font-size-h5: 1.375rem; -$font-size-h6: 1.25rem; -$font-size-small: 85%; diff --git a/packages/gamut-styles/utils/variables/index.scss b/packages/gamut-styles/utils/variables/index.scss deleted file mode 100644 index bd7c8ef4530..00000000000 --- a/packages/gamut-styles/utils/variables/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@forward "colors"; -@forward "base"; -@forward "typography"; diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss index 7558af33ec5..9f61025b2e8 100644 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/index.module.scss @@ -1,7 +1,6 @@ @use "sass:color"; @use "variables"; @use "mixins"; -@use "~@codecademy/gamut-styles/utils" as *; // // Base styles // @@ -34,11 +33,11 @@ fieldset[disabled] a.btn { @each $name, $color in variables.$btn-swatches { @if $name == "brand-yellow" { - @include mixins.button-variants($name, $color-black, $color); + @include mixins.button-variants($name, variables.$color-black, $color); } @else if color.channel(color.to-space($color, hsl), "lightness") > 68 { - @include mixins.button-variants($name, $color-black, $color); + @include mixins.button-variants($name, variables.$color-black, $color); } @else { - @include mixins.button-variants($name, $color-white, $color); + @include mixins.button-variants($name, variables.$color-white, $color); } } diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss index 1e9b7431199..d5c66e5d2b6 100644 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/mixins.scss @@ -1,5 +1,4 @@ @use "sass:color"; -@use "~@codecademy/gamut-styles/utils" as *; @use "variables"; // Button variants @@ -8,7 +7,7 @@ // and disabled options for all buttons @mixin button-variant($color, $background, $border: transparent) { - $active-background: color.mix($color-black, $background); + $active-background: color.mix(variables.$color-black, $background); @if $border == transparent { $active-border: transparent; @@ -24,7 +23,7 @@ } &:focus-visible { - box-shadow: 0 0 0 2px $color-white, 0 0 0 4px $background; + box-shadow: 0 0 0 2px variables.$color-white, 0 0 0 4px $background; } &:focus-visible, @@ -60,7 +59,7 @@ } &:focus-visible { - box-shadow: 0 0 0 2px $color-white, 0 0 0 4px $color; + box-shadow: 0 0 0 2px variables.$color-white, 0 0 0 4px $color; } &:disabled { diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss index 40689a0ab57..1a8af0f1d96 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss @@ -1,5 +1,3 @@ -@use "~@codecademy/gamut-styles/utils" as *; - $btn-padding-x: 1rem !default; $btn-padding-y: 0.375rem !default; $btn-font-weight: bold !default; @@ -30,24 +28,26 @@ $btn-outline-hover-state-modifier: 0.9 !default; $btn-outline-active-state-modifier: 0.6 !default; $btn-box-shadow-focus-modifier: 0.5 !default; -$btn-disabled-color: $color-gray-600; +$btn-disabled-color: #646466; $btn-box-shadow-color: rgba(0, 0, 0, 0.3); $btn-swatches: ( // Gamut Next - "hyper": $color-hyper, - "red": $color-red, - "navy": $color-navy, - "white": $color-white, - "grey": $color-gray-300, + "hyper": #3a10e5, + "red": #e91c11, + "navy": #10162f, + "white": #ffffff, + "grey": #c4c3c7, // Gamut Classic - "brand-blue": $color-blue-500, - "brand-red": $brand-red, - "brand-yellow": $brand-yellow, - "brand-purple": $brand-purple, - "brand-dark-blue": $brand-dark-blue, + "brand-blue": #3069f0, + "brand-red": #fd4d3f, + "brand-yellow": #ffd500, + "brand-purple": #6400e4, + "brand-dark-blue": #141c3a, // Editor - "mint": $deprecated-swatches-mint-700, - "darkmint": $deprecated-swatches-mint-800, - "greyblue": $deprecated-swatches-grey-blue-600 + "mint": #34b3a0 "darkmint": #1a7b72, + "greyblue": #354551 ); + +$color-black: #000000; +$color-white: #ffffff; diff --git a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss index 2faea8efbec..f2c34021f4c 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss @@ -8,23 +8,23 @@ width: 100%; &.blue { - color: $color-blue-200; + color: #a5befa; } &.yellow { - background-color: $color-yellow-200; - border: solid $color-yellow-400; + background-color: #fff2b3; + border: solid #ffe359; border-width: 1px 0; font-weight: normal; transition: background-color 0.15s ease-in-out; &:focus-visible { - border-color: $color-yellow-800; + border-color: #b37620; } &:focus, &:hover { - background-color: $color-yellow-300; + background-color: #ffec8c; } } diff --git a/packages/gamut/src/Typography/styles/_variables.scss b/packages/gamut/src/Typography/styles/_variables.scss deleted file mode 100644 index b0f096650ae..00000000000 --- a/packages/gamut/src/Typography/styles/_variables.scss +++ /dev/null @@ -1,54 +0,0 @@ -@use "~@codecademy/gamut-styles/utils"; - -$headingSizes: ( - "xxs": ( - "size": 16, - "margin": 16, - "font": $font-family-base - ), - "xs": ( - "size": 20, - "margin": 16, - "font": $font-family-base - ), - "sm": ( - "size": 22, - "margin": 16, - "font": $font-family-base - ), - "md": ( - "size": 26, - "margin": 20, - "font": $font-family-base - ), - "lg": ( - "size": 34, - "margin": 24, - "font": $font-family-base - ), - "xl": ( - "size": 44, - "margin": 24, - "font": $font-family-base - ), - "xxl": ( - "size": 64, - "margin": 32, - "font": $font-family-base - ) -); - -$textSizes: ( - "sm": ( - "size": 14, - "font": $font-family-base - ), - "md": ( - "size": 16, - "font": $font-family-base - ), - "lg": ( - "size": 20, - "font": $font-family-base - ) -); From 8fcfc391c8bea100ff2e4bc541aebcfb3001eafe Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Wed, 6 May 2026 15:59:36 -0400 Subject: [PATCH 4/6] fix --- .nx/version-plans/version-plan-1778097455598.md | 6 ++++++ .../gamut/src/AccordionButtonDeprecated/styles.module.scss | 2 -- packages/gamut/src/Video/styles/vds_base_theme.scss | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .nx/version-plans/version-plan-1778097455598.md diff --git a/.nx/version-plans/version-plan-1778097455598.md b/.nx/version-plans/version-plan-1778097455598.md new file mode 100644 index 00000000000..a8459527534 --- /dev/null +++ b/.nx/version-plans/version-plan-1778097455598.md @@ -0,0 +1,6 @@ +--- +gamut-styles: major +gamut: major +--- + +removes deprecated scss mixins and variables diff --git a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss index f2c34021f4c..f685414d648 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/styles.module.scss @@ -1,5 +1,3 @@ -@use "~@codecademy/gamut-styles/utils" as *; - .accordionButton { align-items: center; display: flex; diff --git a/packages/gamut/src/Video/styles/vds_base_theme.scss b/packages/gamut/src/Video/styles/vds_base_theme.scss index ada9d234369..8d65b2e9f32 100644 --- a/packages/gamut/src/Video/styles/vds_base_theme.scss +++ b/packages/gamut/src/Video/styles/vds_base_theme.scss @@ -1,5 +1,3 @@ -@use "~@codecademy/gamut-styles/utils" as *; - @import "~@vidstack/react/player/styles/default/theme.css"; @import "~@vidstack/react/player/styles/default/layouts/video.css"; @import "~@vidstack/react/player/styles/default/layouts/audio.css"; From c5e3955b24e2c8464b1184cd794e3ce0b278e3a8 Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Wed, 6 May 2026 16:50:11 -0400 Subject: [PATCH 5/6] fix again --- .../ButtonDeprecated/styles/variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss index 1a8af0f1d96..dc9ffe1c3a6 100755 --- a/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss +++ b/packages/gamut/src/AccordionButtonDeprecated/ButtonDeprecated/styles/variables.scss @@ -45,7 +45,8 @@ $btn-swatches: ( "brand-purple": #6400e4, "brand-dark-blue": #141c3a, // Editor - "mint": #34b3a0 "darkmint": #1a7b72, + "mint": #34b3a0, + "darkmint": #1a7b72, "greyblue": #354551 ); From c075a161a53429934674cef8aa9aad7900fc965f Mon Sep 17 00:00:00 2001 From: Amy Resnik Date: Thu, 7 May 2026 15:19:12 -0400 Subject: [PATCH 6/6] pin polyfill version --- packages/gamut/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gamut/package.json b/packages/gamut/package.json index d7986fff3d5..437e05c3825 100644 --- a/packages/gamut/package.json +++ b/packages/gamut/package.json @@ -9,7 +9,7 @@ "@codecademy/gamut-patterns": "0.10.29", "@codecademy/gamut-styles": "17.14.0", "@codecademy/variance": "0.26.1", - "@formatjs/intl-locale": "^5.3.1", + "@formatjs/intl-locale": "5.3.1", "@react-aria/interactions": "3.25.0", "@types/marked": "^4.0.8", "@vidstack/react": "^1.12.12", diff --git a/yarn.lock b/yarn.lock index 437b7866072..1a3285daa3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1714,7 +1714,7 @@ __metadata: "@codecademy/gamut-patterns": "npm:0.10.29" "@codecademy/gamut-styles": "npm:17.14.0" "@codecademy/variance": "npm:0.26.1" - "@formatjs/intl-locale": "npm:^5.3.1" + "@formatjs/intl-locale": "npm:5.3.1" "@react-aria/interactions": "npm:3.25.0" "@types/marked": "npm:^4.0.8" "@vidstack/react": "npm:^1.12.12" @@ -2393,7 +2393,7 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl-locale@npm:^5.3.1": +"@formatjs/intl-locale@npm:5.3.1": version: 5.3.1 resolution: "@formatjs/intl-locale@npm:5.3.1" dependencies: