Skip to content

Commit c491e61

Browse files
committed
fix(docs): update colors page with correct values and theme support
- Fix info color #00bcd4 -> #1890ff, success #4caf50 -> #52c41a - Remove incorrect Default and Secondary cards - Use CSS variables for color swatches so they update with theme presets - Replace hardcoded colors in SCSS with --ty-* custom properties - Update primary colors description to reflect the token system
1 parent af27290 commit c491e61

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

apps/docs/src/containers/color/color-page.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
font-weight: 600;
2222

2323
tr {
24-
border: 1px solid rgba(0, 0, 0, .1);
24+
border: 1px solid var(--ty-color-border-secondary);
2525
}
2626

2727
td {
2828
padding: 10px;
29-
color: #525F7F;
29+
color: var(--ty-color-text-secondary);
3030
width: 400px;
3131
line-height: 40px;
3232
}
@@ -49,7 +49,7 @@
4949
align-items: center;
5050
justify-content: space-around;
5151
border-radius: 0 0 5px 5px;
52-
background-color: #f4f5f7;
52+
background-color: var(--ty-color-bg-spotlight);
5353
padding: 20px 10px;
5454
}
5555

@@ -59,11 +59,11 @@
5959

6060
&__title {
6161
font-size: 11px;
62-
color: #62748c;
62+
color: var(--ty-color-text-tertiary);
6363
}
6464

6565
&__subtitle {
6666
font-size: 14px;
67-
color: #525f7f;
67+
color: var(--ty-color-text-secondary);
6868
}
6969
}

apps/docs/src/containers/color/index.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ import { useLocaleContext } from '../../context/locale-context';
55
type ColorCardProps = {
66
name: string;
77
hex: string;
8+
cssVar?: string;
89
nameLabel: string;
910
hexLabel: string;
1011
};
1112

12-
const ColorCard = ({ name, hex, nameLabel, hexLabel }: ColorCardProps): React.ReactElement => (
13+
const ColorCard = ({ name, hex, cssVar, nameLabel, hexLabel }: ColorCardProps): React.ReactElement => (
1314
<div className="color-card">
14-
<div className="color-card__header" style={{ backgroundColor: hex }} />
15+
<div
16+
className="color-card__header"
17+
style={{ backgroundColor: cssVar ? `var(${cssVar})` : hex }}
18+
/>
1519
<div className="color-card__footer">
1620
<div>
1721
<p className="color-card__title">{nameLabel}</p>
@@ -48,13 +52,11 @@ const ColorPage = (): React.ReactElement => {
4852
<h2 className="markdown__heading-2">{s.color.primaryTitle}</h2>
4953
<p className="markdown__p">{s.color.primaryDesc}</p>
5054
<div className="color-page__color-panel">
51-
<ColorCard name={s.color.defaultColor} hex="#172b4d" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
52-
<ColorCard name={s.color.primary} hex="#6E41BF" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
53-
<ColorCard name={s.color.secondary} hex="#f7fafc" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
54-
<ColorCard name={s.color.info} hex="#00bcd4" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
55-
<ColorCard name={s.color.success} hex="#4caf50" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
56-
<ColorCard name={s.color.danger} hex="#f44336" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
57-
<ColorCard name={s.color.warning} hex="#ff9800" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
55+
<ColorCard name={s.color.primary} hex="#6e41bf" cssVar="--ty-color-primary" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
56+
<ColorCard name={s.color.info} hex="#1890ff" cssVar="--ty-color-info" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
57+
<ColorCard name={s.color.success} hex="#52c41a" cssVar="--ty-color-success" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
58+
<ColorCard name={s.color.warning} hex="#ff9800" cssVar="--ty-color-warning" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
59+
<ColorCard name={s.color.danger} hex="#f44336" cssVar="--ty-color-danger" nameLabel={s.color.nameLabel} hexLabel={s.color.hexLabel} />
5860
</div>
5961

6062
<h2 className="markdown__heading-2">{s.color.neutralsTitle}</h2>

0 commit comments

Comments
 (0)