Skip to content

Commit 84c1d08

Browse files
dreamwaspdreamwasp
authored
Merge branch 'cass-gm-549' into cass-gm-549-test
2 parents 15059a0 + fca2788 commit 84c1d08

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2310
-892
lines changed

‎nx.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
}
6363
},
6464
"$schema": "./node_modules/nx/schemas/nx-schema.json",
65-
"useDaemonProcess": false,
6665
"nxCloudAccessToken": "ZmVjZWYxNzctYTdmZC00ODYzLTg4MzEtZTE1YTVmZDdkZmY1fHJlYWQ=",
6766
"parallel": 3,
6867
"useInferencePlugins": false,

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
"@emotion/babel-plugin": "11.11.0",
2626
"@emotion/jest": "^11.11.0",
2727
"@mdx-js/react": "^3.1.0",
28-
"@nx/jest": "19.3.2",
29-
"@nx/js": "19.3.2",
30-
"@nx/react": "19.3.2",
31-
"@nx/storybook": "19.3.2",
32-
"@nx/web": "19.3.2",
33-
"@nx/webpack": "19.3.2",
28+
"@nx/jest": "20.5.0",
29+
"@nx/js": "20.5.0",
30+
"@nx/react": "20.5.0",
31+
"@nx/storybook": "20.5.0",
32+
"@nx/web": "20.5.0",
33+
"@nx/webpack": "20.5.0",
3434
"@storybook/addon-controls": "8.3.6",
3535
"@storybook/addon-designs": "^8.0.3",
3636
"@storybook/addon-docs": "^8.3.6",
@@ -81,7 +81,7 @@
8181
"lint-staged": "14.0.1",
8282
"micromatch": "^4.0.5",
8383
"mutationobserver-shim": "^0.3.3",
84-
"nx": "19.3.2",
84+
"nx": "20.5.0",
8585
"nx-cloud": "^19.1.0",
8686
"onchange": "^7.0.2",
8787
"prettier": "^2.8.7",

‎packages/gamut-icons/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [9.46.1](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-17)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-icons
9+
610
## [9.46.0](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-12)
711

812
### Features

‎packages/gamut-icons/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@codecademy/gamut-icons",
33
"description": "Icon library for codecademy.com",
4-
"version": "9.46.0",
4+
"version": "9.46.1",
55
"author": "Codecademy <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut-styles": "17.6.3",
7+
"@codecademy/gamut-styles": "17.6.4",
88
"@codecademy/variance": "0.22.1"
99
},
1010
"files": [

‎packages/gamut-illustrations/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.54.5](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-17)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-illustrations
9+
610
### [0.54.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-05-30)
711

812
**Note:** Version bump only for package @codecademy/gamut-illustrations

‎packages/gamut-illustrations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-illustrations",
33
"description": "Illustrations library for Codecademy",
4-
"version": "0.54.4",
4+
"version": "0.54.5",
55
"author": "Codecademy Engineering <[email protected]>",
66
"bugs": "https://github.com/Codecademy/gamut/issues",
77
"dependencies": {
8-
"@codecademy/gamut-styles": "17.6.3",
8+
"@codecademy/gamut-styles": "17.6.4",
99
"classnames": "^2.2.5"
1010
},
1111
"files": [

‎packages/gamut-kit/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.6.517](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-17)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-kit
9+
10+
### [0.6.516](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-16)
11+
12+
**Note:** Version bump only for package @codecademy/gamut-kit
13+
614
### [0.6.515](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-12)
715

816
**Note:** Version bump only for package @codecademy/gamut-kit

‎packages/gamut-kit/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@codecademy/gamut-kit",
33
"description": "Styleguide & Component library for Codecademy",
4-
"version": "0.6.515",
4+
"version": "0.6.517",
55
"author": "Codecademy Engineering <[email protected]>",
66
"dependencies": {
7-
"@codecademy/gamut": "64.1.2",
8-
"@codecademy/gamut-icons": "9.46.0",
9-
"@codecademy/gamut-illustrations": "0.54.4",
10-
"@codecademy/gamut-patterns": "0.10.10",
11-
"@codecademy/gamut-styles": "17.6.3",
12-
"@codecademy/gamut-tests": "5.2.9",
7+
"@codecademy/gamut": "64.1.4",
8+
"@codecademy/gamut-icons": "9.46.1",
9+
"@codecademy/gamut-illustrations": "0.54.5",
10+
"@codecademy/gamut-patterns": "0.10.11",
11+
"@codecademy/gamut-styles": "17.6.4",
12+
"@codecademy/gamut-tests": "5.2.10",
1313
"@codecademy/variance": "0.22.1",
1414
"component-test-setup": "^0.3.1"
1515
},

‎packages/gamut-patterns/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [0.10.11](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-17)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-patterns
9+
610
### [0.10.10](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-05-30)
711

812
**Note:** Version bump only for package @codecademy/gamut-patterns

‎packages/gamut-patterns/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@codecademy/gamut-patterns",
33
"description": "Pattern library for Codecademy",
4-
"version": "0.10.10",
4+
"version": "0.10.11",
55
"author": "Codecademy Engineering <[email protected]>",
66
"bugs": "https://github.com/Codecademy/gamut/issues",
77
"dependencies": {
8-
"@codecademy/gamut-styles": "17.6.3",
8+
"@codecademy/gamut-styles": "17.6.4",
99
"@codecademy/variance": "0.22.1",
1010
"classnames": "^2.2.5"
1111
},

‎packages/gamut-styles/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
### [17.6.4](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-06-17)
7+
8+
**Note:** Version bump only for package @codecademy/gamut-styles
9+
610
### [17.6.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-05-30)
711

812
**Note:** Version bump only for package @codecademy/gamut-styles

‎packages/gamut-styles/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ to be used as needed both in Gamut and across the Codecademy app.
1919

2020
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.:
2121

22-
`@import "~@codecademy/gamut-styles/utils";`
23-
`@import "~@codecademy/gamut-styles/core";`
22+
`@use "~@codecademy/gamut-styles/utils";`
23+
`@use "~@codecademy/gamut-styles/core";`

‎packages/gamut-styles/core.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import "core/index";
1+
@forward "core/index";

‎packages/gamut-styles/core/index.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../utils";
2-
@import "reboot";
3-
@import "fonts";
4-
@import "typography";
1+
@forward "../utils";
2+
@forward "reboot";
3+
@forward "fonts";
4+
@forward "typography";

‎packages/gamut-styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@codecademy/gamut-styles",
33
"description": "Styleguide & Component library for codecademy.com",
4-
"version": "17.6.3",
4+
"version": "17.6.4",
55
"author": "Jake Hiller <[email protected]>",
66
"dependencies": {
77
"@codecademy/variance": "0.22.1",

‎packages/gamut-styles/utils.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import "utils/index";
1+
@forward "utils/index";

‎packages/gamut-styles/utils/index.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// import order is unfortunately important here
22
// variables needs to access functions, and mixins needs to access variables
3-
@import "functions/index";
4-
@import "variables/index";
5-
@import "mixins/index";
3+
@forward "functions/index";
4+
@forward "variables/index";
5+
@forward "mixins/index";

‎packages/gamut-styles/utils/mixins/_responsive.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Try to use these simple mixins if possible for your responsive needs
2+
@use "../variables/grid" as *;
23

34
// Example usage:
45
//

‎packages/gamut-styles/utils/mixins/index.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "font-smoothing";
2-
@import "no-select";
3-
@import "responsive";
4-
@import "shadow";
5-
@import "sr-only";
6-
@import "legacy";
1+
@forward "font-smoothing";
2+
@forward "no-select";
3+
@forward "responsive";
4+
@forward "shadow";
5+
@forward "sr-only";
6+
@forward "legacy";

‎packages/gamut-styles/utils/mixins/legacy.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// Legacy Helper mixins
2+
@use "../variables/index.scss";
3+
@use "../mixins/responsive" as *;
24

35
// these variables should be located in ../variables
46
// instead, they're co-located with their legacy functions so they can be removed more easily

‎packages/gamut-styles/utils/variables/_base.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "colors" as *;
2+
13
$base-unit: 1rem;
24
$spacer: $base-unit;
35
$box-shadow: 0 1px 4px 0 $color-shadow;

‎packages/gamut-styles/utils/variables/_colors.scss

Lines changed: 62 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// NOTE: When updating, make sure you also update the gamut-styles/variables/index.js file
1+
// NOTE: These are actively being deprecated. Use with caution.
22

3+
@use "sass:color";
34
// =======================================
45
// STANDARD COLORS
56
// =======================================
@@ -41,18 +42,18 @@ $color-shadow: rgba($color-black, 0.15);
4142

4243
$platform-mint-500: #37c3be;
4344

44-
$platform-mint-600: mix($color-black, $platform-mint-500, 20%);
45-
$platform-mint-700: mix($color-black, $platform-mint-500, 40%);
45+
$platform-mint-600: color.mix($color-black, $platform-mint-500, 20%);
46+
$platform-mint-700: color.mix($color-black, $platform-mint-500, 40%);
4647

4748
$platform-purple-500: #69639a;
4849

49-
$platform-purple-200: mix($color-white, $platform-purple-500, 60%);
50-
$platform-purple-300: mix($color-white, $platform-purple-500, 40%);
51-
$platform-purple-400: mix($color-white, $platform-purple-500, 20%);
52-
$platform-purple-600: mix($color-black, $platform-purple-500, 20%);
53-
$platform-purple-700: mix($color-black, $platform-purple-500, 40%);
54-
$platform-purple-800: mix($color-black, $platform-purple-500, 60%);
55-
$platform-purple-900: mix($color-black, $platform-purple-500, 80%);
50+
$platform-purple-200: color.mix($color-white, $platform-purple-500, 60%);
51+
$platform-purple-300: color.mix($color-white, $platform-purple-500, 40%);
52+
$platform-purple-400: color.mix($color-white, $platform-purple-500, 20%);
53+
$platform-purple-600: color.mix($color-black, $platform-purple-500, 20%);
54+
$platform-purple-700: color.mix($color-black, $platform-purple-500, 40%);
55+
$platform-purple-800: color.mix($color-black, $platform-purple-500, 60%);
56+
$platform-purple-900: color.mix($color-black, $platform-purple-500, 80%);
5657

5758
// =======================================
5859
// EDITOR COLORS
@@ -176,75 +177,107 @@ $deprecated-color-black: #000000;
176177

177178
$deprecated-gamut-purple-500: #69639a;
178179

179-
$deprecated-gamut-purple-100: mix(
180+
$deprecated-gamut-purple-100: color.mix(
180181
$color-white,
181182
$deprecated-gamut-purple-500,
182183
80%
183184
);
184-
$deprecated-gamut-purple-200: mix(
185+
$deprecated-gamut-purple-200: color.mix(
185186
$color-white,
186187
$deprecated-gamut-purple-500,
187188
60%
188189
);
189-
$deprecated-gamut-purple-300: mix(
190+
$deprecated-gamut-purple-300: color.mix(
190191
$color-white,
191192
$deprecated-gamut-purple-500,
192193
40%
193194
);
194-
$deprecated-gamut-purple-400: mix(
195+
$deprecated-gamut-purple-400: color.mix(
195196
$color-white,
196197
$deprecated-gamut-purple-500,
197198
20%
198199
);
199-
$deprecated-gamut-purple-600: mix(
200+
$deprecated-gamut-purple-600: color.mix(
200201
$color-black,
201202
$deprecated-gamut-purple-500,
202203
20%
203204
);
204-
$deprecated-gamut-purple-700: mix(
205+
$deprecated-gamut-purple-700: color.mix(
205206
$color-black,
206207
$deprecated-gamut-purple-500,
207208
40%
208209
);
209-
$deprecated-gamut-purple-800: mix(
210+
$deprecated-gamut-purple-800: color.mix(
210211
$color-black,
211212
$deprecated-gamut-purple-500,
212213
60%
213214
);
214-
$deprecated-gamut-purple-900: mix(
215+
$deprecated-gamut-purple-900: color.mix(
215216
$color-black,
216217
$deprecated-gamut-purple-500,
217218
80%
218219
);
219220

220221
$deprecated-gamut-royal-blue-500: #4b35ef;
221222

222-
$deprecated-gamut-royal-blue-600: mix(
223+
$deprecated-gamut-royal-blue-600: color.mix(
223224
$color-black,
224225
$deprecated-gamut-royal-blue-500,
225226
20%
226227
);
227-
$deprecated-gamut-royal-blue-700: mix(
228+
$deprecated-gamut-royal-blue-700: color.mix(
228229
$color-black,
229230
$deprecated-gamut-royal-blue-500,
230231
40%
231232
);
232-
$deprecated-gamut-royal-blue-800: mix(
233+
$deprecated-gamut-royal-blue-800: color.mix(
233234
$color-black,
234235
$deprecated-gamut-royal-blue-500,
235236
60%
236237
);
237238

238239
$deprecated-gamut-mint-500: #37c3be;
239240

240-
$deprecated-gamut-mint-100: mix($color-white, $deprecated-gamut-mint-500, 80%);
241-
$deprecated-gamut-mint-200: mix($color-white, $deprecated-gamut-mint-500, 60%);
242-
$deprecated-gamut-mint-300: mix($color-white, $deprecated-gamut-mint-500, 40%);
243-
$deprecated-gamut-mint-400: mix($color-white, $deprecated-gamut-mint-500, 20%);
244-
$deprecated-gamut-mint-600: mix($color-black, $deprecated-gamut-mint-500, 20%);
245-
$deprecated-gamut-mint-700: mix($color-black, $deprecated-gamut-mint-500, 40%);
246-
$deprecated-gamut-mint-800: mix($color-black, $deprecated-gamut-mint-500, 60%);
247-
$deprecated-gamut-mint-900: mix($color-black, $deprecated-gamut-mint-500, 80%);
241+
$deprecated-gamut-mint-100: color.mix(
242+
$color-white,
243+
$deprecated-gamut-mint-500,
244+
80%
245+
);
246+
$deprecated-gamut-mint-200: color.mix(
247+
$color-white,
248+
$deprecated-gamut-mint-500,
249+
60%
250+
);
251+
$deprecated-gamut-mint-300: color.mix(
252+
$color-white,
253+
$deprecated-gamut-mint-500,
254+
40%
255+
);
256+
$deprecated-gamut-mint-400: color.mix(
257+
$color-white,
258+
$deprecated-gamut-mint-500,
259+
20%
260+
);
261+
$deprecated-gamut-mint-600: color.mix(
262+
$color-black,
263+
$deprecated-gamut-mint-500,
264+
20%
265+
);
266+
$deprecated-gamut-mint-700: color.mix(
267+
$color-black,
268+
$deprecated-gamut-mint-500,
269+
40%
270+
);
271+
$deprecated-gamut-mint-800: color.mix(
272+
$color-black,
273+
$deprecated-gamut-mint-500,
274+
60%
275+
);
276+
$deprecated-gamut-mint-900: color.mix(
277+
$color-black,
278+
$deprecated-gamut-mint-500,
279+
80%
280+
);
248281

249282
$deprecated-gamut-purple: $deprecated-gamut-purple-500;
250283
$deprecated-gamut-royal-blue: $deprecated-gamut-royal-blue-500;

0 commit comments

Comments
 (0)