Skip to content

Commit 4397b71

Browse files
committed
[mercury][accordion] Update styles to match Figma design
1 parent e8cc21c commit 4397b71

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

packages/common/src/metadata/components/accordion/models.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { getIconPath } from "@genexus/mercury/assets-manager.js";
44
const FOLDER_ICON = getIconPath({
55
category: "system",
66
name: "folder",
7-
colorType: "on-surface"
7+
colorType: "on-interactive"
88
});
99

1010
export const ACCORDION_ITEMS_IDS = [
@@ -31,19 +31,19 @@ const createModel = (disabled: boolean = false, withIcons: boolean = false) => {
3131
{
3232
id: ACCORDION_ITEMS_IDS[1],
3333
caption: ACCORDION_ITEMS_CAPTIONS[1],
34-
expanded: !disabled,
34+
expanded: false,
3535
...(withIcons && { startImgSrc: FOLDER_ICON })
3636
},
3737
{
3838
id: ACCORDION_ITEMS_IDS[2],
3939
caption: ACCORDION_ITEMS_CAPTIONS[2],
40-
expanded: !disabled,
40+
expanded: false,
4141
...(withIcons && { startImgSrc: FOLDER_ICON })
4242
},
4343
{
4444
id: ACCORDION_ITEMS_IDS[3],
4545
caption: ACCORDION_ITEMS_CAPTIONS[3],
46-
expanded: !disabled,
46+
expanded: false,
4747
...(withIcons && { startImgSrc: FOLDER_ICON })
4848
}
4949
];

packages/mercury/src/components/accordion/_accordion-styles.scss

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,66 +73,79 @@
7373
}
7474

7575
&-filled {
76+
// chevron icon
77+
--ch-accordion__header-background-image: var(
78+
--icon__system_chevron-down_on-interactive--enabled
79+
);
7680
&--hover {
7781
--accordion-bg-color: var(--color-accent-item-hover);
7882
--accordion-header-color: var(--color-text-primary-on-hover);
7983
--ch-accordion__header-background-image: var(
80-
--icon__system_chevron-down_on-surface--hover
84+
--icon__system_chevron-down_on-interactive--hover
8185
);
8286
}
8387

8488
&--active {
8589
--accordion-bg-color: var(--color-accent-item-active);
8690
--accordion-header-color: var(--color-text-primary-on-pressed);
8791
--ch-accordion__header-background-image: var(
88-
--icon__system_chevron-down_on-surface--active
92+
--icon__system_chevron-down_on-interactive--active
8993
);
9094
}
9195

9296
&--disabled {
9397
--accordion-header-color: var(--color-text-neutral-on-disabled);
9498
--ch-accordion__header-background-image: var(
95-
--icon__system_chevron-down_on-disabled--enabled
99+
--icon__system_chevron-down_on-interactive--disabled
96100
);
97101
}
98102
}
99103

100104
&-filled-header {
101-
--accordion-header-bg-color: var(
105+
--ch-accordion__header-background-image: var(
106+
--icon__system_chevron-down_on-interactive--enabled
107+
);
108+
--accordion-bg-color: var(
102109
--elevation-background-color,
103110
var(--color-accent-surface-elevation-01)
104111
);
105-
background-color: var(--accordion-header-bg-color);
112+
background-color: var(--accordion-bg-color);
106113

107114
&--disabled {
108-
--accordion-header-bg-color: var(--color-accent-neutral-disabled);
115+
--accordion-bg-color: var(--color-accent-neutral-disabled);
109116
--accordion-header-color: var(--color-text-neutral-on-disabled);
110117
}
111118
}
112119

113120
&-outlined {
114-
--accordion-header-outline-color: transparent;
121+
--ch-accordion__header-background-image: var(
122+
--icon__system_chevron-down_interactive--enabled
123+
);
124+
--accordion-header-outline-color: var(--panel-border-color);
115125
--accordion-header-outline-width: var(--size-1);
116126
outline: var(--size-1) solid var(--accordion-header-outline-color);
117127

118128
&--hover {
119-
--accordion-header-outline-color: var(--color-border-item-hover);
129+
--accordion-header-outline-color: var(--color-border-primary-hover);
120130
--accordion-header-color: var(--color-text-primary-hover);
121131
--ch-accordion__header-background-image: var(
122-
--icon__system_chevron-down_on-surface--hover
132+
--icon__system_chevron-down_interactive--hover
123133
);
124134
}
125135

126136
&--active {
127137
--accordion-header-outline-color: var(--color-border-item-active);
128138
--accordion-header-color: var(--color-text-primary-pressed);
129139
--ch-accordion__header-background-image: var(
130-
--icon__system_chevron-down_on-surface--active
140+
--icon__system_chevron-down_interactive--active
131141
);
132142
}
133143

134144
&--disabled {
135145
--accordion-header-color: var(--color-text-neutral-disabled);
146+
--ch-accordion__header-background-image: var(
147+
--icon__system_chevron-down_interactive--disabled
148+
);
136149
}
137150
}
138151

packages/mercury/src/components/accordion/_accordion-tokens.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// spacing
1010
--spacing-body-block-start: var(--size-12);
1111
--spacing-body-block-end: var(--size-12);
12-
--spacing-body-inline-start: var(--size-12);
13-
--spacing-body-inline-end: var(--size-12);
12+
--spacing-body-inline-start: var(--size-8);
13+
--spacing-body-inline-end: var(--size-8);
1414

1515
// panel
1616
--accordion-border-radius: var(--size-4);
@@ -20,9 +20,4 @@
2020
// header
2121
--accordion-header-outline-color: transparent;
2222
--accordion-header-border-radius: var(--accordion-border-radius);
23-
24-
// chevron icon
25-
--ch-accordion__header-background-image: var(
26-
--icon__system_chevron-down_on-surface--enabled
27-
);
2823
}

0 commit comments

Comments
 (0)