Skip to content

Commit b8b54c4

Browse files
authored
chore(colors): revert neutral color assignments (#4759)
* chore(colors): revert neutral color assignments * chore(colors): update test snapshots
1 parent f17491a commit b8b54c4

File tree

83 files changed

+341
-331
lines changed

Some content is hidden

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

83 files changed

+341
-331
lines changed

RELEASENOTES.general.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
- Timepicker
1717

1818
- Added SLDS scope customizer tool: `npm run slds:customizer`
19-
- Added new standard color palette for neutral colors (black/white/grays)
20-
and updated multiple neutral colors to match new Salesforce color system
19+
- Added new standard color palette for neutral colors (black/white/grays)
2120

2221
## 2.15.8 - May 27, 2021
2322

__tests__/__snapshots__/tokens.spec.js.snap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,17 @@ Array [
7878
"PALETTE_INDIGO_10",
7979
"PALETTE_INDIGO_65",
8080
"PALETTE_INDIGO_15",
81+
"PALETTE_NEUTRAL_90",
82+
"PALETTE_NEUTRAL_80",
83+
"PALETTE_NEUTRAL_70",
84+
"PALETTE_NEUTRAL_100",
85+
"PALETTE_NEUTRAL_60",
86+
"PALETTE_NEUTRAL_50",
87+
"PALETTE_NEUTRAL_40",
88+
"PALETTE_NEUTRAL_95",
89+
"PALETTE_NEUTRAL_30",
90+
"PALETTE_NEUTRAL_20",
91+
"PALETTE_NEUTRAL_10",
8192
"PALETTE_ORANGE_90",
8293
"PALETTE_ORANGE_80",
8394
"PALETTE_ORANGE_70",

design-tokens/extensions/ui-analytics/base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ props:
286286
- animation-duration
287287
comment: ''
288288
COLOR_WHITE:
289-
value: '{!PALETTE_NEUTRAL_100}'
289+
value: '{!WHITE}'
290290
type: color
291291
category: background-color
292292
cssProperties:

design-tokens/extensions/ui-force/background-color.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,72 +13,72 @@ imports:
1313
- ../../aliases/color-palettes.yml
1414
props:
1515
COLOR_BACKGROUND_SPINNER_DOT:
16-
value: '{!PALETTE_NEUTRAL_60}'
16+
value: '{!PALETTE_COOL_GRAY_7}'
1717
comment: Color of the spinner dot.
1818

1919
COLOR_BACKGROUND_NOTIFICATION_BADGE:
2020
value: '{!PALETTE_RED_50}'
2121
comment: Notifications badge background color.
2222
access: global
2323
COLOR_BACKGROUND_NOTIFICATION_NEW:
24-
value: '{!PALETTE_NEUTRAL_95}'
24+
value: '{!PALETTE_COOL_GRAY_2}'
2525
comment: Background color for a new notification list item.
2626
access: global
2727
COLOR_BACKGROUND_REMINDER:
28-
value: '{!PALETTE_NEUTRAL_95}'
28+
value: '{!PALETTE_GRAY_2}'
2929
comment: Background color for reminder notification
3030
release: 2.5.0
3131
COLOR_BACKGROUND_REMINDER_HOVER:
32-
value: '{!PALETTE_NEUTRAL_100}'
32+
value: '{!WHITE}'
3333
comment: Background color for reminder notification on hover
3434
COLOR_BACKGROUND_POST:
35-
value: '{!PALETTE_NEUTRAL_95}'
35+
value: '{!PALETTE_COOL_GRAY_2}'
3636
comment: Background color of comment posts in the feed.
3737

3838
COLOR_BACKGROUND_BACKDROP_TINT:
39-
value: '{!PALETTE_NEUTRAL_95}'
39+
value: '{!PALETTE_COOL_GRAY_2}'
4040
comment: The color of the mask overlay that provides user feedback on interaction.
4141

4242
COLOR_BACKGROUND_SCROLLBAR:
43-
value: '{!PALETTE_NEUTRAL_80}'
43+
value: '{!PALETTE_COOL_GRAY_4}'
4444
comment: The background color of an internal scrollbar.
4545
access: global
4646
COLOR_BACKGROUND_SCROLLBAR_TRACK:
47-
value: '{!PALETTE_NEUTRAL_60}'
47+
value: '{!PALETTE_COOL_GRAY_6}'
4848
comment: The background color of an internal scrollbar track.
4949
access: global
5050
COLOR_BACKGROUND_TOGGLE:
51-
value: '{!PALETTE_NEUTRAL_60}'
51+
value: '{!PALETTE_COOL_GRAY_7}'
5252
comment: Toggle background color.
5353
COLOR_BACKGROUND_TOGGLE_DISABLED:
54-
value: '{!PALETTE_NEUTRAL_60}'
54+
value: '{!PALETTE_COOL_GRAY_7}'
5555
comment: Disabled toggle background color.
5656
COLOR_BACKGROUND_TOGGLE_HOVER:
57-
value: '{!PALETTE_NEUTRAL_60}'
57+
value: '{!PALETTE_COOL_GRAY_8}'
5858
comment: Hovered toggle background color.
5959

6060
COLOR_BACKGROUND_INPUT:
61-
value: '{!PALETTE_NEUTRAL_100}'
61+
value: '{!WHITE}'
6262
comment: Default input field
6363
access: global
6464
COLOR_BACKGROUND_INPUT_ACTIVE:
65-
value: '{!PALETTE_NEUTRAL_100}'
65+
value: '{!WHITE}'
6666
comment: Selected input field (when user has clicked or tabbed into field)
6767
access: global
6868
COLOR_BACKGROUND_INPUT_CHECKBOX_DISABLED:
69-
value: '{!PALETTE_NEUTRAL_70}'
69+
value: '{!PALETTE_COOL_GRAY_5}'
7070
comment: Disabled checkboxes
7171
access: global
7272
COLOR_BACKGROUND_INPUT_DISABLED:
73-
value: '{!PALETTE_NEUTRAL_80}'
73+
value: '{!PALETTE_COOL_GRAY_4}'
7474
comment: Disabled input
7575
access: global
7676
COLOR_BACKGROUND_INPUT_ERROR:
7777
value: '{!PALETTE_PINK_90}'
7878
comment: Background color for input field that has encountered an error.
7979
access: global
8080
COLOR_BACKGROUND_PILL:
81-
value: '{!PALETTE_NEUTRAL_100}'
81+
value: '{!WHITE}'
8282
comment: Background color for pills.
8383
access: global
8484
COLOR_BACKGROUND_IMAGE_OVERLAY:
@@ -95,7 +95,7 @@ props:
9595
value: '{!PALETTE_GREEN_50}'
9696
comment: Active background color for success buttons
9797
COLOR_BACKGROUND_TOAST:
98-
value: '{!PALETTE_NEUTRAL_50}'
98+
value: '{!PALETTE_COOL_GRAY_9}'
9999
comment: Background color for toast messaging.
100100
access: global
101101
COLOR_BACKGROUND_TOAST_SUCCESS:
@@ -107,7 +107,7 @@ props:
107107
comment: Background color for error toast messaging.
108108
access: global
109109
FILL_HEADER_BUTTON:
110-
value: '{!PALETTE_NEUTRAL_60}'
110+
value: '{!PALETTE_GRAY_7}'
111111
comment: 'Header button icon color'
112112
cssProperties:
113113
- fill

design-tokens/extensions/ui-force/border-color.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ props:
1616
comment: Border color for a selected tab in a tab group.
1717
access: global
1818
COLOR_BORDER_TAB_ACTIVE:
19-
value: '{!PALETTE_NEUTRAL_100}'
19+
value: '{!WHITE}'
2020
comment: Border color for an active tab.
2121

2222
COLOR_BORDER_ICON_INVERSE_HINT:
@@ -31,29 +31,29 @@ props:
3131
comment: Border color for brandable primary button - disabled state
3232
access: global
3333
COLOR_BORDER_BUTTON_DEFAULT:
34-
value: '{!PALETTE_NEUTRAL_70}'
34+
value: '{!PALETTE_COOL_GRAY_5}'
3535
comment: Border color for default secondary button
3636
access: global
3737
COLOR_BORDER_BUTTON_INVERSE_DISABLED:
3838
value: '{!WHITE_TRANSPARENT_15}'
3939
comment: Border color for disabled inverse button.
4040
access: global
4141
COLOR_BORDER_INPUT:
42-
value: '{!PALETTE_NEUTRAL_70}'
42+
value: '{!PALETTE_COOL_GRAY_5}'
4343
comment: Border color on form elements.
4444
access: global
4545
COLOR_BORDER_INPUT_ACTIVE:
4646
value: '{!PALETTE_BLUE_60}'
4747
comment: Border color on active form elements.
4848
access: global
4949
COLOR_BORDER_INPUT_DISABLED:
50-
value: '{!PALETTE_NEUTRAL_60}'
50+
value: '{!PALETTE_COOL_GRAY_6}'
5151
comment: Border color on disabled form elements.
5252
access: global
5353
COLOR_BORDER_TOGGLE_CHECKED:
54-
value: '{!PALETTE_NEUTRAL_100}'
54+
value: '{!WHITE}'
5555
comment: These borders create the faux checkmark when the checkbox toggle is in the checked state.
5656

5757
COLOR_BORDER_REMINDER:
58-
value: '{!PALETTE_NEUTRAL_80}'
58+
value: '{!PALETTE_GRAY_4}'
5959
comment: Border color on notification reminders.

design-tokens/extensions/ui-force/box-shadow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ props:
1919
comment: Custom glow for focus states on UI elements with explicit containers.
2020
access: global
2121
SHADOW_BUTTON_FOCUS_INVERSE:
22-
value: '{!OFFSET_NONE} {!OFFSET_NONE} {!OFFSET_SMALL}px {!PALETTE_NEUTRAL_80}'
22+
value: '{!OFFSET_NONE} {!OFFSET_NONE} {!OFFSET_SMALL}px {!PALETTE_COOL_GRAY_4}'
2323
comment: Custom glow for focus states on UI button elements with explicit containers on dark or vibrantly colored backgrounds.
2424
access: global
2525
SHADOW_INLINE_EDIT:

design-tokens/extensions/ui-force/deprecated/background-color.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ imports:
1414
- ../../../aliases/color-palettes.yml
1515
props:
1616
COLOR_BACKGROUND_PRIMARY:
17-
value: '{!PALETTE_NEUTRAL_100}'
17+
value: '{!PALETTE_COOL_GRAY_1}'
1818
COLOR_BACKGROUND_SECONDARY:
19-
value: '{!PALETTE_NEUTRAL_95}'
19+
value: '{!PALETTE_COOL_GRAY_2}'
2020
COLOR_FOREGROUND_PRIMARY:
21-
value: '{!PALETTE_NEUTRAL_100}'
21+
value: '{!PALETTE_COOL_GRAY_1}'
2222
COLOR_CONTRAST_PRIMARY:
23-
value: '{!PALETTE_NEUTRAL_95}'
23+
value: '{!PALETTE_COOL_GRAY_2}'
2424
COLOR_CONTRAST_SECONDARY:
25-
value: '{!PALETTE_NEUTRAL_100}'
25+
value: '{!PALETTE_COOL_GRAY_1}'
2626
COLOR_BACKGROUND_BRAND_PRIMARY:
2727
value: '{!PALETTE_BLUE_50}'
2828
COLOR_BACKGROUND_BRAND_PRIMARY_HOVER:
@@ -32,13 +32,13 @@ props:
3232
COLOR_BACKGROUND_BRAND_PRIMARY_ACTIVE:
3333
value: '{!PALETTE_BLUE_20}'
3434
PAGE_COLOR_BACKGROUND_PRIMARY:
35-
value: '{!PALETTE_NEUTRAL_100}'
35+
value: '{!PALETTE_COOL_GRAY_1}'
3636
comment: 'Winter 18 token, this has been deprecated. Please use BRAND_BACKGROUND_PRIMARY instead.'
3737
COLOR_BACKGROUND_ALT_2:
38-
value: '{!PALETTE_NEUTRAL_90}'
38+
value: '{!PALETTE_COOL_GRAY_3}'
3939
comment: Used when further differentiation is needed because colorBackground and colorBackgroundAlt are both being used in close proximity.
4040
COLOR_BACKGROUND_BROWSER:
41-
value: '{!PALETTE_NEUTRAL_50}'
41+
value: '{!PALETTE_COOL_GRAY_9}'
4242
comment: 'Secondary top bar background color (child browser, file preview, etc.)'
4343
access: global
4444
COLOR_BACKGROUND_CHROME_MOBILE:
@@ -65,17 +65,17 @@ props:
6565
value: '{!PALETTE_BLUE_10}'
6666
comment: Stage left org switcher dropdown arrow background color.
6767
COLOR_BACKGROUND_PAYLOAD:
68-
value: '{!PALETTE_NEUTRAL_95}'
68+
value: '{!PALETTE_COOL_GRAY_2}'
6969
comment: Background color for payloads in the feed.
7070
access: global
7171
COLOR_BACKGROUND_UTILITY_BAR_HOVER:
72-
value: '{!PALETTE_NEUTRAL_80}'
72+
value: '{!PALETTE_COOL_GRAY_4}'
7373
comment: Hover color for utility bar item.
7474
COLOR_BACKGROUND_UTILITY_BAR_ACTIVE:
7575
value: '{!PALETTE_BLUE_60}'
7676
comment: Active color for utility bar item.
7777
COLOR_BACKGROUND_SHADE_DARK:
78-
value: '{!PALETTE_NEUTRAL_70}'
78+
value: '{!PALETTE_COOL_GRAY_5}'
7979
specificity: builders
8080
comment: Used as gray background in conjunction with Shade when more contrast is desired.
8181
COLOR_BACKGROUND_TEMP_MODAL:
@@ -108,7 +108,7 @@ props:
108108
value: '{!PALETTE_RED_70}'
109109
comment: Alternative color for UI elements related to errors.
110110
COLOR_BACKGROUND_ACTIONBAR_ICON_UTILITY:
111-
value: '{!PALETTE_NEUTRAL_50}'
111+
value: '{!PALETTE_COOL_GRAY_9}'
112112
comment: Background for utility icons that live in the action bar on mobile.
113113
COLOR_BACKGROUND_INDICATOR_DOT:
114114
value: '{!PALETTE_BLUE_20}'
@@ -125,7 +125,7 @@ props:
125125
value: '{!WHITE}'
126126
comment: Background color for notification list item.
127127
COLOR_BACKGROUND_SHADE:
128-
value: '{!PALETTE_NEUTRAL_80}'
128+
value: '{!PALETTE_COOL_GRAY_4}'
129129
specificity: builders
130130
comment: Used as gray background when more contrast is desired.
131131
access: global

design-tokens/extensions/ui-force/deprecated/border-color.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ imports:
1313
- ../../../aliases/color-palettes.yml
1414
props:
1515
COLOR_BORDER_PRIMARY:
16-
value: '{!PALETTE_NEUTRAL_70}'
16+
value: '{!PALETTE_COOL_GRAY_5}'
1717
COLOR_BORDER_BRAND_PRIMARY:
1818
value: '{!PALETTE_BLUE_60}'
1919
COLOR_BORDER_BRAND_PRIMARY_HOVER:
@@ -27,12 +27,12 @@ props:
2727
specificity: builders
2828
comment: Used to delineate the boundary of a specific region. Specific to builders.
2929
COLOR_STROKE_DISABLED:
30-
value: '{!PALETTE_NEUTRAL_80}'
30+
value: '{!PALETTE_COOL_GRAY_4}'
3131
cssProperties:
3232
- stroke
3333
comment: Disabled stroke color.
3434
COLOR_STROKE_HEADER_BUTTON:
35-
value: '{!PALETTE_NEUTRAL_60}'
35+
value: '{!PALETTE_COOL_GRAY_7}'
3636
cssProperties:
3737
- stroke
3838
comment: Stroke color for our global header buttons.
@@ -64,9 +64,9 @@ props:
6464
comment: Border color for brandable primary button
6565
access: global
6666
COLOR_BORDER_BUTTON_FOCUS_INVERSE:
67-
value: '{!PALETTE_NEUTRAL_80}'
67+
value: '{!PALETTE_COOL_GRAY_4}'
6868
COLOR_BORDER_LINK_FOCUS_INVERSE:
69-
value: '{!PALETTE_NEUTRAL_80}'
69+
value: '{!PALETTE_COOL_GRAY_4}'
7070
COLOR_BORDER_INPUT_CHECKBOX_SELECTED_CHECKMARK:
7171
value: '{!WHITE}'
7272
comment: The borders to create the checkmark

design-tokens/extensions/ui-force/deprecated/box-shadow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ props:
105105
value: '{!OFFSET_NONE} -{!OFFSET_XX_LARGE}px {!OFFSET_XX_LARGE}px {!OFFSET_NONE} {!BLACK_TRANSPARENT_16}'
106106
comment: Deprecated
107107
SHADOW_ACTION_OVERFLOW_FOOTER:
108-
value: '{!OFFSET_NONE} -{!OFFSET_X_SMALL}px {!OFFSET_MEDIUM}px {!PALETTE_NEUTRAL_95}'
108+
value: '{!OFFSET_NONE} -{!OFFSET_X_SMALL}px {!OFFSET_MEDIUM}px {!PALETTE_COOL_GRAY_2}'
109109
comment: Shadow above overflow menu close bar.
110110
SHADOW_LINK_FOCUS_INVERSE:
111-
value: '{!OFFSET_NONE} {!OFFSET_NONE} {!OFFSET_SMALL}px {!PALETTE_NEUTRAL_80}'
111+
value: '{!OFFSET_NONE} {!OFFSET_NONE} {!OFFSET_SMALL}px {!PALETTE_COOL_GRAY_4}'
112112
comment: Custom glow for focus states on UI link elements with explicit containers on dark or vibrantly colored backgrounds.

design-tokens/extensions/ui-force/deprecated/text-color.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ props:
1616
value: '{!PALETTE_BLUE_20}'
1717
comment: Primary body text color
1818
COLOR_TEXT_SECONDARY:
19-
value: '{!PALETTE_NEUTRAL_50}'
19+
value: '{!PALETTE_COOL_GRAY_9}'
2020
comment: Secondary body text color
2121
COLOR_TEXT_TERTIARY:
22-
value: '{!PALETTE_NEUTRAL_50}'
22+
value: '{!PALETTE_COOL_GRAY_9}'
2323
comment: Tertiary body text color
2424
COLOR_TEXT_MODAL:
2525
value: '{!WHITE}'
2626
comment: Modal header title
2727
access: global
2828
COLOR_TEXT_MODAL_BUTTON:
29-
value: '{!PALETTE_NEUTRAL_50}'
29+
value: '{!PALETTE_COOL_GRAY_9}'
3030
comment: Modal header button text color
3131
access: global
3232
COLOR_TEXT_STAGE_LEFT:
33-
value: '{!PALETTE_NEUTRAL_80}'
33+
value: '{!PALETTE_COOL_GRAY_4}'
3434
comment: Text in stage left navigation.
3535
access: global
3636
COLOR_TEXT_TOAST:
37-
value: '{!PALETTE_NEUTRAL_80}'
37+
value: '{!PALETTE_COOL_GRAY_4}'
3838
comment: Color for text on toast messages.
3939
access: global
4040
COLOR_TEXT_PILL:
@@ -62,7 +62,7 @@ props:
6262
comment: Active state on a standalone link on a dark background.
6363
access: global
6464
COLOR_TEXT_INVERSE_HOVER:
65-
value: '{!PALETTE_NEUTRAL_60}'
65+
value: '{!PALETTE_COOL_GRAY_7}'
6666
comment: Hover state on a standalone link on a dark background.
6767
access: global
6868
COLOR_TEXT_TAB_LABEL_SELECTED:
@@ -82,18 +82,18 @@ props:
8282
comment: Color for text in active state in a tab group.
8383
access: global
8484
COLOR_TEXT_TAB_LABEL_DISABLED:
85-
value: '{!PALETTE_NEUTRAL_80}'
85+
value: '{!PALETTE_COOL_GRAY_4}'
8686
comment: Color for disabled text in a tab group.
8787
access: global
8888
COLOR_TEXT_ICON_BRAND:
8989
value: '{!PALETTE_BLUE_50}'
9090
comment: Color for non-interactive icons that represent a selected item in a list
9191
access: global
9292
COLOR_TEXT_ICON_UTILITY:
93-
value: '{!PALETTE_NEUTRAL_60}'
93+
value: '{!PALETTE_COOL_GRAY_7}'
9494
comment: Color for interactive utility icons
9595
COLOR_TEXT_TOGGLE_DISABLED:
96-
value: '{!PALETTE_NEUTRAL_70}'
96+
value: '{!PALETTE_COOL_GRAY_5}'
9797
comment: Color for disabled toggles
9898
COLOR_TEXT_ICON_INVERSE_HINT:
9999
value: '{!WHITE_TRANSPARENT_50}'
@@ -102,5 +102,5 @@ props:
102102
value: '{!WHITE_TRANSPARENT_75}'
103103
comment: Hovered icon color for a button that has a parent element that has a hover state
104104
COLOR_TEXT_ICON_DEFAULT_HINT_BORDERLESS:
105-
value: '{!PALETTE_NEUTRAL_80}'
105+
value: '{!PALETTE_COOL_GRAY_4}'
106106
comment: Icon color for a button that has a parent element that has a hover state. This is the default text/icon color for that button before its parent has been hovered over.

0 commit comments

Comments
 (0)