Skip to content

Commit bf60f78

Browse files
Fix/light-tokens (#1180)
* 🐛 Add light token colors for headings and navigation elements * 🔖 Update version to 10.5.1 * 🐛 Remove duplicate tokens * 🐛 Remove unused table typography variables from light and dark tokens
1 parent b8a66e2 commit bf60f78

3 files changed

Lines changed: 36 additions & 17 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@equinor/amplify-component-lib",
3-
"version": "10.5.0",
3+
"version": "10.5.1",
44
"description": "Frontend Typescript components for the Amplify team",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

src/atoms/style/darkTokens.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,7 @@ export const darkTokens = css`
193193
--eds_navigation__button_color: var(--eds_text_static_icons__default);
194194
--eds_input__label_color: var(--eds_text_static_icons__default);
195195
--eds_input__text_color: var(--eds_text_static_icons__default);
196-
--eds_paragraph__body_short_color: var(--eds_text_static_icons__default);
197-
--eds_paragraph__body_long_link_color: var(
198-
--eds_text_static_icons__default
199-
);
196+
200197
--eds_table__cell_header_color: var(--eds_text_static_icons__default);
201198
--eds_table__cell_text_color: var(--eds_text_static_icons__default);
202199
--eds_table__cell_text_bold_color: var(--eds_text_static_icons__default);
@@ -213,20 +210,14 @@ export const darkTokens = css`
213210
--eds_paragraph__body_short_color: var(--eds_text_static_icons__default);
214211
--eds_paragraph__body_long_color: var(--eds_text_static_icons__default);
215212
--eds_paragraph__meta_color: var(--eds_text_static_icons__default);
213+
--eds_paragraph__body_long_link_color: var(
214+
--eds_text_static_icons__default
215+
);
216216
217217
--eds_interactive__icon_on_interactive_colors: var(
218218
--eds_text_static_icons__default
219219
);
220220
221221
--eds_ui__chip__badge_color: var(--eds_text_static_icons__default);
222-
223-
/* Override table typography variables */
224-
--eds_table__cell_header_color: var(--eds_text__static_icons__default);
225-
--eds_table__cell_text_color: var(--eds_text__static_icons__default);
226-
--eds_table__cell_text_bold_color: var(--eds_text__static_icons__default);
227-
--eds_table__cell_text_link_color: var(--eds_text__static_icons__default);
228-
--eds_table__cell_numeric_monospaced_color: var(
229-
--eds_text__static_icons__default
230-
);
231222
}
232223
`;

src/atoms/style/lightTokens.ts

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,46 @@ export const lightTokens = css`
144144
--eds_interactive__disabled__border: rgba(220, 220, 220, 1);
145145
--eds_interactive__disabled__fill: rgba(234, 234, 234, 1);
146146
--eds_interactive__link_on_interactive_colors: rgba(255, 255, 255, 1);
147-
--eds_interactive__icon_on_interactive_colors: rgba(255, 255, 255, 1);
148147
--eds_interactive__link_in_snackbars: rgba(151, 202, 206, 1);
149148
--eds_interactive__pressed_overlay_dark: rgba(0, 0, 0, 0.2);
150149
--eds_interactive__pressed_overlay_light: rgba(255, 255, 255, 0.2);
151150
152-
/* Override table typography variables */
151+
--eds_heading__h1_color: var(--eds_text__static_icons__default);
152+
--eds_heading__h2_color: var(--eds_text__static_icons__default);
153+
--eds_heading__h3_color: var(--eds_text__static_icons__default);
154+
--eds_heading__h4_color: var(--eds_text__static_icons__default);
155+
--eds_heading__h5_color: var(--eds_text__static_icons__default);
156+
--eds_heading__h6_color: var(--eds_text__static_icons__default);
157+
158+
--eds_navigation__label_color: var(--eds_text__static_icons__default);
159+
--eds_navigation__button_color: var(--eds_text__static_icons__default);
160+
--eds_input__label_color: var(--eds_text__static_icons__default);
161+
--eds_input__text_color: var(--eds_text__static_icons__default);
162+
153163
--eds_table__cell_header_color: var(--eds_text__static_icons__default);
154164
--eds_table__cell_text_color: var(--eds_text__static_icons__default);
155165
--eds_table__cell_text_bold_color: var(--eds_text__static_icons__default);
156-
--eds_table__cell_text_link_color: var(--eds_text__static_icons__default);
157166
--eds_table__cell_numeric_monospaced_color: var(
158167
--eds_text__static_icons__default
159168
);
169+
170+
--eds_navigation__menu_title_color: var(--eds_text__static_icons__default);
171+
--eds_navigation__menu_tabs_color: var(--eds_text__static_icons__default);
172+
--eds_ui__accordion_header_color: var(--eds_text__static_icons__default);
173+
174+
--eds_paragraph__overline_color: var(--eds_text__static_icons__default);
175+
--eds_paragraph__caption_color: var(--eds_text__static_icons__default);
176+
--eds_paragraph__body_short_color: var(--eds_text__static_icons__default);
177+
--eds_paragraph__body_long_color: var(--eds_text__static_icons__default);
178+
--eds_paragraph__meta_color: var(--eds_text__static_icons__default);
179+
--eds_paragraph__body_long_link_color: var(
180+
--eds_text__static_icons__default
181+
);
182+
183+
--eds_interactive__icon_on_interactive_colors: var(
184+
--eds_text__static_icons__default
185+
);
186+
187+
--eds_ui__chip__badge_color: var(--eds_text__static_icons__default);
160188
}
161189
`;

0 commit comments

Comments
 (0)