Skip to content

Commit f4dcdd7

Browse files
authored
Merge pull request #1955 from dxc-technology/revert-1947-rarrojolopez/chip-specs
Revert "Update Chip specs"
2 parents a0fadb7 + 59d5c51 commit f4dcdd7

File tree

6 files changed

+58
-16
lines changed

6 files changed

+58
-16
lines changed

lib/src/common/variables.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ export const componentTokens = {
215215
focusColor: CoreTokens.color_blue_600,
216216
focusBorderStyle: CoreTokens.border_solid,
217217
focusBorderThickness: CoreTokens.border_width_2,
218+
focusBorderRadius: CoreTokens.border_radius_medium,
218219
},
219220
dateInput: {
220221
pickerBackgroundColor: CoreTokens.color_white,

website/screens/common/themes/advanced-theme.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,13 @@
191191
},
192192
"chip": {
193193
"backgroundColor": "#e6e6e6",
194+
"disabledBackgroundColor": "#f2f2f2",
194195
"fontFamily": "Open Sans, sans-serif",
195196
"fontSize": "1rem",
196197
"fontStyle": "normal",
197198
"fontWeight": "400",
198199
"fontColor": "#000000",
200+
"disabledFontColor": "#999999",
199201
"borderColor": "transparent",
200202
"borderRadius": "80px",
201203
"borderThickness": "0px",
@@ -212,7 +214,8 @@
212214
"disabledIconColor": "#999999",
213215
"focusColor": "#0095ff",
214216
"focusBorderStyle": "solid",
215-
"focusBorderThickness": "2px"
217+
"focusBorderThickness": "2px",
218+
"focusBorderRadius": "0.25rem"
216219
},
217220
"dateInput": {
218221
"pickerBackgroundColor": "#ffffff",

website/screens/components/chip/code/ChipCodePage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ const sections = [
9595
<td>
9696
<TableCode>boolean</TableCode>
9797
</td>
98-
<td>
99-
If true, action prefix icon or action suffix icon (if defined)
100-
will be disabled.
101-
</td>
98+
<td>If true, the component will be disabled.</td>
10299
<td>
103100
<TableCode>false</TableCode>
104101
</td>

website/screens/components/chip/specs/ChipSpecsPage.tsx

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import Figure from "@/common/Figure";
1111
import Image from "@/common/Image";
1212
import Code from "@/common/Code";
1313
import specsImage from "./images/chip_specs.png";
14+
import statesImage from "./images/chip_states_container.png";
1415
import prefixSuffixStatesImage from "./images/chip_states_action.png";
1516
import anatomyImage from "./images/chip_anatomy.png";
1617

@@ -27,6 +28,13 @@ const sections = [
2728
title: "States",
2829
content: (
2930
<>
31+
<DxcParagraph>
32+
The chip component container states are <strong>enabled</strong> and{" "}
33+
<strong>disabled</strong>:
34+
</DxcParagraph>
35+
<Figure caption="Chip states">
36+
<Image src={statesImage} alt="Chip states" />
37+
</Figure>
3038
<DxcParagraph>
3139
The chip action item has the following states:{" "}
3240
<strong>enabled</strong>, <strong>hover</strong>,{" "}
@@ -106,6 +114,26 @@ const sections = [
106114
</td>
107115
<td>transparent</td>
108116
</tr>
117+
<tr>
118+
<td>
119+
<Code>disabledBackgroundColor</Code>
120+
</td>
121+
<td>Container:disabled</td>
122+
<td>
123+
<Code>color-grey-100</Code>
124+
</td>
125+
<td>#f2f2f2</td>
126+
</tr>
127+
<tr>
128+
<td>
129+
<Code>disabledFontcolor</Code>
130+
</td>
131+
<td>Label:disabled</td>
132+
<td>
133+
<Code>color-grey-500</Code>
134+
</td>
135+
<td>#999999</td>
136+
</tr>
109137
<tr>
110138
<td>
111139
<Code>disabledIconColor</Code>
@@ -299,7 +327,7 @@ const sections = [
299327
<tbody>
300328
<tr>
301329
<td>
302-
<Code>borderThickness</Code>
330+
<Code>border-width</Code>
303331
</td>
304332
<td>Chip container</td>
305333
<td>
@@ -309,27 +337,27 @@ const sections = [
309337
</tr>
310338
<tr>
311339
<td>
312-
<Code>borderStyle</Code>
340+
<Code>border-style</Code>
313341
</td>
314342
<td>Chip container</td>
315343
<td>
316-
<Code>border-style-solid</Code>
344+
<Code>border-style-none</Code>
317345
</td>
318-
<td>solid</td>
346+
<td>none</td>
319347
</tr>
320348
<tr>
321349
<td>
322-
<Code>borderRadius</Code>
350+
<Code>border-radius</Code>
323351
</td>
324352
<td>Chip container</td>
325353
<td>
326-
<Code>-</Code>
354+
<Code>border-radius-full</Code>
327355
</td>
328-
<td>80px</td>
356+
<td>9999px</td>
329357
</tr>
330358
<tr>
331359
<td>
332-
<Code>focusBorderThickness</Code>
360+
<Code>border-width</Code>
333361
</td>
334362
<td>Focus border</td>
335363
<td>
@@ -339,14 +367,24 @@ const sections = [
339367
</tr>
340368
<tr>
341369
<td>
342-
<Code>focusBorderStyle</Code>
370+
<Code>border-style</Code>
343371
</td>
344372
<td>Focus border</td>
345373
<td>
346374
<Code>border-style-solid</Code>
347375
</td>
348376
<td>solid</td>
349377
</tr>
378+
<tr>
379+
<td>
380+
<Code>border-radius</Code>
381+
</td>
382+
<td>Focus border</td>
383+
<td>
384+
<Code>border-radius-medium</Code>
385+
</td>
386+
<td>0.25rem / 4px</td>
387+
</tr>
350388
</tbody>
351389
</DxcTable>
352390
),
@@ -372,7 +410,7 @@ const sections = [
372410
<td>
373411
<Code>size-icon-large</Code>
374412
</td>
375-
<td>24px</td>
413+
<td>24x24px</td>
376414
</tr>
377415
</tbody>
378416
</DxcTable>
-14 Bytes
Loading

website/screens/theme-generator/themes/schemas/advanced.schema.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@
191191
},
192192
"chip": {
193193
"backgroundColor": "color",
194+
"disabledBackgroundColor": "color",
195+
"disabledFontColor": "color",
194196
"fontColor": "color",
195197
"fontFamily": "fFamily",
196198
"fontSize": "length",
@@ -212,7 +214,8 @@
212214
"disabledIconColor": "color",
213215
"focusColor": "color",
214216
"focusBorderStyle": "bStyle",
215-
"focusBorderThickness": "length"
217+
"focusBorderThickness": "length",
218+
"focusBorderRadius": "length"
216219
},
217220
"dateInput": {
218221
"pickerBackgroundColor": "color",

0 commit comments

Comments
 (0)