Skip to content

Commit 2336da5

Browse files
jellisonsalesforcejellisonsalesforce
authored
Merge branch '242-spring-23' into WCAG-2.1-path-color-changes
2 parents 108d731 + 7a23c35 commit 2336da5

File tree

18 files changed

+183
-56
lines changed

18 files changed

+183
-56
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ jobs:
315315
- run:
316316
name: 'Do build-dist'
317317
command: 'npm run build-dist'
318-
318+
environment:
319+
NODE_OPTIONS: --openssl-legacy-provider
319320
####
320321
- run:
321322
name: Compress .dist
@@ -390,6 +391,8 @@ jobs:
390391
- run:
391392
name: Build static Storybook
392393
command: 'npm run storybook:build'
394+
environment:
395+
NODE_OPTIONS: --openssl-legacy-provider
393396

394397
- run:
395398
name: Archive static Storybook
@@ -492,6 +495,7 @@ jobs:
492495
command: 'npm run build'
493496
environment:
494497
SLDS__FRAMEWORK__PATH: .slds/.dist/
498+
NODE_OPTIONS: --openssl-legacy-provider
495499

496500
- run:
497501
name: 'Generate site tarball'

‎RELEASENOTES.general.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,61 @@
33

44
## 2.20.0 - Upcoming
55

6+
- Updated constant colors codes with global slds hooks
7+
- Updated background colors for Standard and Actions icons
8+
- Added two new dependencies for SLDS global styling hooks generation,
9+
- `@salesforce-ux/sds-styling-aliases` with version `0.2.4`
10+
- `@salesforce-ux/sds-styling-hooks` with version `1.1.0-alpha.2`
11+
- Updated `gulp` file to include SLDS global hooks generation as part of build and dist jobs
12+
- Updated design tokens in every component and utility with SLDS global styling hooks (except Brand-related tokens)
13+
- Updated icons to `v10.5.3`
14+
- Standard Set:
15+
- Added `asset_hierarchy`
16+
- Added `budget_category_value`
17+
- Added `budget_period`
18+
- Updated `crypto_category_wallet_group`
19+
- Added `crypto_transaction_envelope_change_snapshot`
20+
- Added `data_transforms`
21+
- Added `funding_award_adjustment`
22+
- Added `funding_requirement`
23+
- Added `promotion_tiers`
24+
- Added `slack_conversations`
25+
- Added `your_account`
26+
27+
- Utility Set:
28+
- Added `asset_object`
29+
- Added `budget_category_value`
30+
- Added `budget_period`
31+
- Added `contact`
32+
- Added `funding_award_adjustment`
33+
- Added `funding_requirement`
34+
- Added `http`
35+
- Added `knowledge_smart_link`
36+
- Added `lead`
37+
- Added `maintenance_plan`
38+
- Added `no_return`
39+
- Added `opportunity`
40+
- Added `orders`
41+
- Added `product`
42+
- Added `proposition`
43+
- Added `queue`
44+
- Added `send_log`
45+
- Added `service_contract`
46+
- Added `slack_conversations`
47+
48+
- Updated BG color to below Standard Icons
49+
- `connect_wallet`
50+
- `crypto_product_category_wallet_role`
51+
- `crypto_product`
52+
- `crypto_transaction_envelope_change_log`
53+
- `crypto_transaction_envelope`
54+
- `crypto_transaction`
55+
- `crypto_wallet_group_item`
56+
- `crypto_wallet_group`
57+
- `crypto_wallet`
58+
- `nft_settings`
59+
- `nft_studio`
60+
661
## 2.19.0 - August 11, 2022
762

863
- Updated icons to `v10.4.0`
@@ -32,9 +87,11 @@
3287
- Added `tax_rate`
3388
- Added `tax_treatment`
3489
- Added `water`
90+
3591
- Action Set:
3692
- Added `action_scan_enabled`
3793
- Added `action_scan_disabled`
94+
3895
- Utility Set:
3996
- Added `captions`
4097
- Added `contract_line_outcome`

‎RELEASENOTES.md

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,58 @@
33

44
## Release 2.20.0 - Upcoming
55

6-
- Updated constanst colors codes with global slds hooks
6+
- Updated constant colors codes with global slds hooks
77
- Updated background colors for Standard and Actions icons
88
- Added two new dependencies for SLDS global styling hooks generation,
99
- `@salesforce-ux/sds-styling-aliases` with version `0.2.4`
1010
- `@salesforce-ux/sds-styling-hooks` with version `1.1.0-alpha.2`
11-
- Updated `gulpfile` to include SLDS global hooks generation as part of build and dist jobs
12-
- Updated design tokens in every component and utility with SLDS global styling hooks (except Brand related tokens)
11+
- Updated `gulp` file to include SLDS global hooks generation as part of build and dist jobs
12+
- Updated design tokens in every component and utility with SLDS global styling hooks (except Brand-related tokens)
13+
- Updated icons to `v10.5.3`
14+
- Standard Set:
15+
- Added `asset_hierarchy`
16+
- Added `budget_category_value`
17+
- Added `budget_period`
18+
- Updated `crypto_category_wallet_group`
19+
- Added `crypto_transaction_envelope_change_snapshot`
20+
- Added `data_transforms`
21+
- Added `funding_award_adjustment`
22+
- Added `funding_requirement`
23+
- Added `promotion_tiers`
24+
- Added `slack_conversations`
25+
- Added `your_account`
26+
- Utility Set:
27+
- Added `asset_object`
28+
- Added `budget_category_value`
29+
- Added `budget_period`
30+
- Added `contact`
31+
- Added `funding_award_adjustment`
32+
- Added `funding_requirement`
33+
- Added `http`
34+
- Added `knowledge_smart_link`
35+
- Added `lead`
36+
- Added `maintenance_plan`
37+
- Added `no_return`
38+
- Added `opportunity`
39+
- Added `orders`
40+
- Added `product`
41+
- Added `proposition`
42+
- Added `queue`
43+
- Added `send_log`
44+
- Added `service_contract`
45+
- Added `slack_conversations`
46+
- Updated BG color to below Standard Icons
47+
- `connect_wallet`
48+
- `crypto_product_category_wallet_role`
49+
- `crypto_product`
50+
- `crypto_transaction_envelope_change_log`
51+
- `crypto_transaction_envelope`
52+
- `crypto_transaction`
53+
- `crypto_wallet_group_item`
54+
- `crypto_wallet_group`
55+
- `crypto_wallet`
56+
- `nft_settings`
57+
- `nft_studio`
1358

1459
## Release 2.19.0 - August 11, 2022
1560

‎design-tokens/bg-standard.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -930,37 +930,35 @@ props:
930930
AI_ACCELERATOR_CARD:
931931
value: '#107CAD'
932932
CONNECT_WALLET:
933-
value: '#B60554'
933+
value: '#1B96FF'
934934
CONTRACT_LINE_OUTCOME:
935935
value: '#22683E'
936936
CONTRACT_LINE_OUTCOME_DATA:
937937
value: '#22683E'
938938
CRYPTO_CATEGORY_WALLET_GROUP:
939-
value: '#B60554'
939+
value: '#032D60'
940940
CRYPTO_PRODUCT:
941941
value: '#9050E9'
942-
CRYPTO_PRODUCT_CATEGORY_WALLET_ROLE:
943-
value: '#056764'
944942
CRYPTO_TRANSACTION:
945-
value: '#FF5D2D'
943+
value: '#7E2600'
946944
CRYPTO_TRANSACTION_ENVELOPE:
947-
value: '#056764'
945+
value: '#06A59A'
948946
CRYPTO_TRANSACTION_ENVELOPE_ITEM:
949947
value: '#107CAD'
950948
CRYPTO_WALLET:
951-
value: '#22683E'
949+
value: '#396547'
952950
CRYPTO_WALLET_GROUP:
953951
value: '#107CAD'
954952
CRYPTO_WALLET_GROUP_ITEM:
955-
value: '#9050E9'
953+
value: '#5A1BA9'
956954
CUSTOMER:
957955
value: '#22683E'
958956
CUSTOMER_WORKSPACE:
959957
value: '#22683E'
960958
LEARNER_PROGRAM:
961959
value: '#FF5D2D'
962960
NFT_SETTINGS:
963-
value: '#FF538A'
961+
value: '#B60554'
964962
NFT_STUDIO:
965963
value: '#5867E8'
966964
PROMPT:
@@ -977,3 +975,27 @@ props:
977975
value: '#22683E'
978976
WATER:
979977
value: '#5867E8'
978+
ASSET_HIERARCHY:
979+
value: '#107CAD'
980+
SLACK_CONVERSATIONS:
981+
value: '#481A54'
982+
DATA_TRANSFORMS:
983+
value: '#5867E8'
984+
CRYPTO_PRODUCT_CATEGORY_WALLET_ROLE:
985+
value: '#FF5D2D'
986+
CRYPTO_TRANSACTION_ENVELOPE_CHANGE_LOG:
987+
value: '#084968'
988+
CRYPTO_TRANSACTION_ENVELOPE_CHANGE_SNAPSHOT:
989+
value: '#CB65FF'
990+
PROMOTION_TIERS:
991+
value: '#396547'
992+
BUDGET_PERIOD:
993+
value: '#9602C7'
994+
BUDGET_CATEGORY_VALUE:
995+
value: '#1B96FF'
996+
FUNDING_AWARD_ADJUSTMENT:
997+
value: '#1B96FF'
998+
FUNDING_REQUIREMENT:
999+
value: '#396547'
1000+
YOUR_ACCOUNT:
1001+
value: '#1B96FF'

‎package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CSS"
99
],
1010
"homepage": "https://lightningdesignsystem.com",
11-
"version": "2.20.0-alpha.2",
11+
"version": "2.20.0-beta.1",
1212
"author": "Salesforce",
1313
"bugs": {
1414
"url": "https://github.com/salesforce-ux/design-system/issues"
@@ -49,7 +49,7 @@
4949
"@salesforce-ux/design-system-markup": "^2.0.4",
5050
"@salesforce-ux/design-system-parser": "^1.1.1",
5151
"@salesforce-ux/design-system-primitive-tokens": "0.3.6",
52-
"@salesforce-ux/icons": "10.4.0",
52+
"@salesforce-ux/icons": "10.5.3",
5353
"@salesforce-ux/instant-vrt": "2.0.0",
5454
"@salesforce-ux/postcss-annotations-parser": "0.1.1",
5555
"@salesforce-ux/postcss-css-variable-value": "0.2.0",

‎ui/components/alert/base/_index.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ $alert-gradient-size-background: 64px 64px;
5454
}
5555

5656
&:active {
57-
color: var(--slds-c-alert-text-color-active, var(--sds-c-alert-text-color-active, var(--slds-g-color-neutral-base-100, #{$color-text-link-inverse-active})));
57+
color: var(--slds-c-alert-text-color-active, var(--sds-c-alert-text-color-active, $color-text-link-inverse-active));
5858
}
5959

6060
&[disabled] {
6161
// @TODO: declare at shared/global level
62-
color: var(--slds-g-color-neutral-base-100, #{$color-text-link-inverse-disabled});
62+
color: $color-text-link-inverse-disabled;
6363
}
6464
}
6565
}

‎ui/components/button-icons/base/_index.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
&[disabled],
8686
&:disabled {
8787
background-color: $color-background-button-inverse-disabled;
88-
border-color: var(--slds-g-color-neutral-base-100, #{$color-border-button-inverse-disabled});
88+
border-color: $color-border-button-inverse-disabled;
8989
}
9090
}
9191

@@ -135,20 +135,20 @@
135135

136136
&:hover,
137137
&:focus {
138-
color: var(--slds-g-color-neutral-base-100, #{$color-text-link-inverse-hover});
138+
color: $color-text-link-inverse-hover;
139139
}
140140

141141
&:focus {
142142
@include focus-inverse;
143143
}
144144

145145
&:active {
146-
color: var(--slds-g-color-neutral-base-100, #{$color-text-link-inverse-active});
146+
color: $color-text-link-inverse-active;
147147
}
148148

149149
&[disabled],
150150
&:disabled {
151-
color: var(--slds-g-color-neutral-base-100, #{$color-text-link-inverse-disabled});
151+
color: $color-text-link-inverse-disabled;
152152
}
153153
}
154154

@@ -321,18 +321,18 @@
321321
*/
322322
.slds-button__icon_inverse-hint,
323323
.slds-button__icon--inverse-hint {
324-
fill: var(--slds-g-color-neutral-base-100, #{$color-text-icon-inverse-hint});
324+
fill: $color-text-icon-inverse-hint;
325325
}
326326

327327
// Handles hint on hover behavior of an inverse button icon, both bordered and non-bordered
328328
.slds-hint-parent {
329329

330330
.slds-button_icon-border-inverse,
331331
.slds-button--icon-border-inverse {
332-
border-color: var(--slds-g-color-neutral-base-100, #{$color-border-icon-inverse-hint});
332+
border-color: $color-border-icon-inverse-hint;
333333

334334
&:focus {
335-
border-color: var(--slds-g-color-neutral-base-100, #{$color-border-icon-inverse-hint-hover});
335+
border-color: $color-border-icon-inverse-hint-hover;
336336
}
337337
}
338338

@@ -341,7 +341,7 @@
341341

342342
.slds-button_icon-border-inverse,
343343
.slds-button--icon-border-inverse {
344-
border-color: var(--slds-g-color-neutral-base-100, #{$color-border-icon-inverse-hint-hover});
344+
border-color: $color-border-icon-inverse-hint-hover;
345345
}
346346

347347
.slds-button__icon_hint,
@@ -351,7 +351,7 @@
351351

352352
.slds-button__icon_inverse-hint,
353353
.slds-button__icon--inverse-hint {
354-
fill: var(--slds-g-color-neutral-base-100, #{$color-text-icon-inverse-hint-hover});
354+
fill: $color-text-icon-inverse-hint-hover;
355355
}
356356

357357
.slds-button:disabled {

0 commit comments

Comments
 (0)