Skip to content

Commit 14eeda6

Browse files
authored
Merge pull request #6210 from pat270/LPD-59466
fix(clayui.com): LPD-59466 Colors hex value should be hex
2 parents 13338fe + e559b22 commit 14eeda6

File tree

4 files changed

+70
-23
lines changed

4 files changed

+70
-23
lines changed

www/app/clay.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@use 'sass:math' as *;
22

3-
@import 'atlas-variables';
43
@import 'atlas.scss';
54

65
// Breakpoints

www/next.config.mjs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,16 @@ const nextConfig = {
371371
];
372372
},
373373
sassOptions: {
374-
includePaths: [clay.includePaths[0]],
375-
precision: 8,
374+
includePaths: [
375+
clay.includePaths[0],
376+
path.join(clay.includePaths[0], 'atlas'),
377+
path.join(clay.includePaths[0], 'variables'),
378+
],
379+
outputStyle:
380+
process.env.NODE_ENV === 'development' ? 'expanded' : 'compressed',
381+
precision: 5,
382+
sourceMap: true,
383+
sourceMapContents: true,
376384
},
377385
transpilePackages: ['renoun'],
378386
webpack(config) {

www/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"remark-gfm": "^4.0.0",
3434
"renoun": "^7.9.0",
3535
"restyle": "^3.0.0",
36-
"sass": "^1.71.1",
36+
"sass": "1.64.1",
3737
"shiki": "0.14.6",
3838
"zod": "^3.24.1"
3939
},

www/yarn.lock

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,14 @@ ansi-styles@^4.1.0:
11251125
dependencies:
11261126
color-convert "^2.0.1"
11271127

1128+
anymatch@~3.1.2:
1129+
version "3.1.3"
1130+
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
1131+
integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
1132+
dependencies:
1133+
normalize-path "^3.0.0"
1134+
picomatch "^2.0.4"
1135+
11281136
argparse@^2.0.1:
11291137
version "2.0.1"
11301138
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -1302,6 +1310,11 @@ bcp-47-match@^2.0.0:
13021310
resolved "https://registry.yarnpkg.com/bcp-47-match/-/bcp-47-match-2.0.3.tgz#603226f6e5d3914a581408be33b28a53144b09d0"
13031311
integrity sha512-JtTezzbAibu8G0R9op9zb3vcWZd9JF6M0xOYGPn0fNCd7wOpRB1mU2mH9T8gaBGbAAyIIVgB2G7xG0GP98zMAQ==
13041312

1313+
binary-extensions@^2.0.0:
1314+
version "2.3.0"
1315+
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
1316+
integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
1317+
13051318
boolbase@^1.0.0:
13061319
version "1.0.0"
13071320
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1314,7 +1327,7 @@ brace-expansion@^2.0.1:
13141327
dependencies:
13151328
balanced-match "^1.0.0"
13161329

1317-
braces@^3.0.3:
1330+
braces@^3.0.3, braces@~3.0.2:
13181331
version "3.0.3"
13191332
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
13201333
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -1405,12 +1418,20 @@ character-reference-invalid@^2.0.0:
14051418
resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
14061419
integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
14071420

1408-
chokidar@^4.0.0:
1409-
version "4.0.0"
1410-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.0.tgz#4d603963e5dd762dc5c7bb1cb5664e53a3002225"
1411-
integrity sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==
1412-
dependencies:
1413-
readdirp "^4.0.1"
1421+
"chokidar@>=3.0.0 <4.0.0":
1422+
version "3.6.0"
1423+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
1424+
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
1425+
dependencies:
1426+
anymatch "~3.1.2"
1427+
braces "~3.0.2"
1428+
glob-parent "~5.1.2"
1429+
is-binary-path "~2.1.0"
1430+
is-glob "~4.0.1"
1431+
normalize-path "~3.0.0"
1432+
readdirp "~3.6.0"
1433+
optionalDependencies:
1434+
fsevents "~2.3.2"
14141435

14151436
ci-info@^3.7.0:
14161437
version "3.9.0"
@@ -2357,6 +2378,11 @@ fs.realpath@^1.0.0:
23572378
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
23582379
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
23592380

2381+
fsevents@~2.3.2:
2382+
version "2.3.3"
2383+
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
2384+
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
2385+
23602386
function-bind@^1.1.2:
23612387
version "1.1.2"
23622388
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
@@ -2411,7 +2437,7 @@ get-tsconfig@^4.7.5:
24112437
dependencies:
24122438
resolve-pkg-maps "^1.0.0"
24132439

2414-
glob-parent@^5.1.2:
2440+
glob-parent@^5.1.2, glob-parent@~5.1.2:
24152441
version "5.1.2"
24162442
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
24172443
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -2805,6 +2831,13 @@ is-bigint@^1.1.0:
28052831
dependencies:
28062832
has-bigints "^1.0.2"
28072833

2834+
is-binary-path@~2.1.0:
2835+
version "2.1.0"
2836+
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
2837+
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
2838+
dependencies:
2839+
binary-extensions "^2.0.0"
2840+
28082841
is-boolean-object@^1.2.1:
28092842
version "1.2.1"
28102843
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89"
@@ -2883,7 +2916,7 @@ is-generator-function@^1.0.10:
28832916
dependencies:
28842917
has-tostringtag "^1.0.0"
28852918

2886-
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
2919+
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
28872920
version "4.0.3"
28882921
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
28892922
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -3885,6 +3918,11 @@ node-html-parser@^7.0.1:
38853918
css-select "^5.1.0"
38863919
he "1.2.0"
38873920

3921+
normalize-path@^3.0.0, normalize-path@~3.0.0:
3922+
version "3.0.0"
3923+
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
3924+
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
3925+
38883926
normalize-strings@^1.1.0:
38893927
version "1.1.1"
38903928
resolved "https://registry.yarnpkg.com/normalize-strings/-/normalize-strings-1.1.1.tgz#80f416daf75968899df8262e379a67e46d0b4b5a"
@@ -4132,7 +4170,7 @@ picocolors@^1.0.0:
41324170
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
41334171
integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
41344172

4135-
picomatch@^2.3.1:
4173+
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
41364174
version "2.3.1"
41374175
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
41384176
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -4252,10 +4290,12 @@ readability-scores@^1.0.0:
42524290
unified "^9.0.0"
42534291
unist-util-visit "^2.0.2"
42544292

4255-
readdirp@^4.0.1:
4256-
version "4.0.1"
4257-
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.1.tgz#b2fe35f8dca63183cd3b86883ecc8f720ea96ae6"
4258-
integrity sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==
4293+
readdirp@~3.6.0:
4294+
version "3.6.0"
4295+
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
4296+
integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
4297+
dependencies:
4298+
picomatch "^2.2.1"
42594299

42604300
recma-build-jsx@^1.0.0:
42614301
version "1.0.0"
@@ -4642,12 +4682,12 @@ safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
46424682
es-errors "^1.3.0"
46434683
is-regex "^1.2.1"
46444684

4645-
sass@^1.71.1:
4646-
version "1.79.3"
4647-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.3.tgz#7811b000eb68195fe51dea89177e73e7ef7f546f"
4648-
integrity sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==
4685+
sass@1.64.1:
4686+
version "1.64.1"
4687+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf"
4688+
integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==
46494689
dependencies:
4650-
chokidar "^4.0.0"
4690+
chokidar ">=3.0.0 <4.0.0"
46514691
immutable "^4.0.0"
46524692
source-map-js ">=0.6.2 <2.0.0"
46534693

0 commit comments

Comments
 (0)