Skip to content

Commit e360842

Browse files
authored
Merge pull request #1947 from dxc-technology/rarrojolopez/chip-specs
Update Chip specs
2 parents b18ba60 + 4b21616 commit e360842

File tree

6 files changed

+16
-58
lines changed

6 files changed

+16
-58
lines changed

lib/src/common/variables.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ 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,
219218
},
220219
dateInput: {
221220
pickerBackgroundColor: CoreTokens.color_white,

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,11 @@
191191
},
192192
"chip": {
193193
"backgroundColor": "#e6e6e6",
194-
"disabledBackgroundColor": "#f2f2f2",
195194
"fontFamily": "Open Sans, sans-serif",
196195
"fontSize": "1rem",
197196
"fontStyle": "normal",
198197
"fontWeight": "400",
199198
"fontColor": "#000000",
200-
"disabledFontColor": "#999999",
201199
"borderColor": "transparent",
202200
"borderRadius": "80px",
203201
"borderThickness": "0px",
@@ -214,8 +212,7 @@
214212
"disabledIconColor": "#999999",
215213
"focusColor": "#0095ff",
216214
"focusBorderStyle": "solid",
217-
"focusBorderThickness": "2px",
218-
"focusBorderRadius": "0.25rem"
215+
"focusBorderThickness": "2px"
219216
},
220217
"dateInput": {
221218
"pickerBackgroundColor": "#ffffff",

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

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

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

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ 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";
1514
import prefixSuffixStatesImage from "./images/chip_states_action.png";
1615
import anatomyImage from "./images/chip_anatomy.png";
1716

@@ -28,13 +27,6 @@ const sections = [
2827
title: "States",
2928
content: (
3029
<>
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>
3830
<DxcParagraph>
3931
The chip action item has the following states:{" "}
4032
<strong>enabled</strong>, <strong>hover</strong>,{" "}
@@ -114,26 +106,6 @@ const sections = [
114106
</td>
115107
<td>transparent</td>
116108
</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>
137109
<tr>
138110
<td>
139111
<Code>disabledIconColor</Code>
@@ -327,7 +299,7 @@ const sections = [
327299
<tbody>
328300
<tr>
329301
<td>
330-
<Code>border-width</Code>
302+
<Code>borderThickness</Code>
331303
</td>
332304
<td>Chip container</td>
333305
<td>
@@ -337,27 +309,27 @@ const sections = [
337309
</tr>
338310
<tr>
339311
<td>
340-
<Code>border-style</Code>
312+
<Code>borderStyle</Code>
341313
</td>
342314
<td>Chip container</td>
343315
<td>
344-
<Code>border-style-none</Code>
316+
<Code>border-style-solid</Code>
345317
</td>
346-
<td>none</td>
318+
<td>solid</td>
347319
</tr>
348320
<tr>
349321
<td>
350-
<Code>border-radius</Code>
322+
<Code>borderRadius</Code>
351323
</td>
352324
<td>Chip container</td>
353325
<td>
354-
<Code>border-radius-full</Code>
326+
<Code>-</Code>
355327
</td>
356-
<td>9999px</td>
328+
<td>80px</td>
357329
</tr>
358330
<tr>
359331
<td>
360-
<Code>border-width</Code>
332+
<Code>focusBorderThickness</Code>
361333
</td>
362334
<td>Focus border</td>
363335
<td>
@@ -367,24 +339,14 @@ const sections = [
367339
</tr>
368340
<tr>
369341
<td>
370-
<Code>border-style</Code>
342+
<Code>focusBorderStyle</Code>
371343
</td>
372344
<td>Focus border</td>
373345
<td>
374346
<Code>border-style-solid</Code>
375347
</td>
376348
<td>solid</td>
377349
</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>
388350
</tbody>
389351
</DxcTable>
390352
),
@@ -410,7 +372,7 @@ const sections = [
410372
<td>
411373
<Code>size-icon-large</Code>
412374
</td>
413-
<td>24x24px</td>
375+
<td>24px</td>
414376
</tr>
415377
</tbody>
416378
</DxcTable>
14 Bytes
Loading

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@
191191
},
192192
"chip": {
193193
"backgroundColor": "color",
194-
"disabledBackgroundColor": "color",
195-
"disabledFontColor": "color",
196194
"fontColor": "color",
197195
"fontFamily": "fFamily",
198196
"fontSize": "length",
@@ -214,8 +212,7 @@
214212
"disabledIconColor": "color",
215213
"focusColor": "color",
216214
"focusBorderStyle": "bStyle",
217-
"focusBorderThickness": "length",
218-
"focusBorderRadius": "length"
215+
"focusBorderThickness": "length"
219216
},
220217
"dateInput": {
221218
"pickerBackgroundColor": "color",

0 commit comments

Comments
 (0)