Skip to content

Commit f5290ee

Browse files
662 - css fixes
1 parent f817936 commit f5290ee

5 files changed

Lines changed: 59 additions & 12 deletions

File tree

src/components/modus-wc-content-tree/modus-wc-content-tree.scss

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,25 @@ modus-wc-content-tree {
77
background-color: var(--modus-wc-color-base-page);
88
border: 1px solid var(--modus-wc-color-base-100);
99
display: block;
10-
min-width: 320px;
10+
min-width: 290px;
1111
width: 100%;
1212

1313
.modus-wc-content-tree-actions {
1414
align-items: center;
1515
display: flex;
1616
gap: var(--modus-wc-spacing-xs, 0.5rem);
1717
justify-content: flex-end;
18-
margin-top: var(--modus-wc-spacing-md, 1rem);
19-
padding-bottom: var(--modus-wc-spacing-sm, 0.75rem);
18+
padding: var(--modus-wc-spacing-sm, 0.75rem);
19+
20+
.modus-wc-content-tree-action-button {
21+
background-color: transparent;
22+
23+
&:hover,
24+
&:active,
25+
&[aria-pressed='true'] {
26+
background-color: transparent;
27+
}
28+
}
2029

2130
.modus-wc-content-tree-action-icon {
2231
color: var(--modus-wc-color-black);
@@ -33,7 +42,7 @@ modus-wc-content-tree {
3342
}
3443

3544
.modus-wc-content-tree-header {
36-
padding: var(--modus-wc-spacing-md, 1rem);
45+
padding: var(--modus-wc-spacing-sm, 1rem);
3746
}
3847

3948
.modus-wc-content-tree-empty {

src/components/modus-wc-content-tree/modus-wc-content-tree.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ export class ModusWcContentTree {
228228
{this.includeActions && (
229229
<div class="modus-wc-content-tree-actions">
230230
<modus-wc-button
231+
customClass="modus-wc-content-tree-action-button"
231232
variant="borderless"
232233
size="sm"
233234
shape="circle"

src/components/modus-wc-content-tree/modus-wc-tree-actions/modus-wc-tree-actions.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ modus-wc-tree-actions {
1010
.modus-wc-tree-action-button {
1111
background: transparent;
1212
border: none;
13-
color: var(--modus-wc-color-black);
13+
color: var(--modus-wc-color-base-content);
1414
cursor: pointer;
1515
visibility: hidden;
1616

1717
&:hover {
1818
background: transparent;
19-
color: var(--modus-wc-color-black);
19+
color: var(--modus-wc-color-base-content);
20+
}
21+
22+
&:active,
23+
&[aria-pressed='true'] {
24+
background: transparent;
2025
}
2126
}
2227
}
@@ -70,10 +75,10 @@ modus-wc-tree-actions {
7075
[data-theme='connect-dark'] {
7176
.modus-wc-tree-actions-container {
7277
.modus-wc-tree-action-button {
73-
color: var(--modus-wc-color-gray-light);
78+
color: var(--modus-wc-color-base-content);
7479

7580
&:hover {
76-
color: var(--modus-wc-color-white);
81+
color: var(--modus-wc-color-base-content);
7782
}
7883
}
7984
}

src/components/modus-wc-content-tree/modus-wc-tree-actions/modus-wc-tree-actions.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export class ModusWcTreeActions {
198198
disabled={action.disabled}
199199
size={this.size}
200200
shape="circle"
201+
variant="borderless"
201202
onClick={(e) => this.handleActionClick(action, e)}
202203
>
203204
<modus-wc-icon
@@ -213,6 +214,7 @@ export class ModusWcTreeActions {
213214
customClass="modus-wc-tree-action-button"
214215
size={this.size}
215216
shape="circle"
217+
variant="borderless"
216218
ref={(el) => (this.moreActionsButton = el as HTMLElement)}
217219
onClick={this.handleMoreActionsClick}
218220
aria-expanded={this.isDropdownOpen ? 'true' : 'false'}

src/components/modus-wc-content-tree/modus-wc-tree-item/modus-wc-tree-item.scss

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,33 @@ modus-wc-tree-item {
1111
.modus-wc-tree-item-selected > .modus-wc-tree-content {
1212
background-color: var(--modus-wc-color-blue-pale);
1313
border-radius: unset;
14-
color: var(--modus-wc-color-primary);
14+
color: var(--modus-wc-color-base-content);
15+
16+
.modus-wc-tree-item-label,
17+
modus-wc-icon {
18+
color: var(--modus-wc-color-base-content);
19+
}
20+
21+
modus-wc-tree-actions .modus-wc-tree-actions-container .modus-wc-tree-action-button {
22+
visibility: visible;
23+
}
24+
}
25+
26+
.modus-wc-tree-item:focus-visible {
27+
outline: none;
28+
}
29+
30+
.modus-wc-tree-item:focus-visible > .modus-wc-tree-content {
31+
border-radius: 0;
32+
outline: 2px solid #0063a3;
33+
outline-offset: 0;
1534
}
1635

1736
.modus-wc-tree-content {
1837
align-items: center;
1938
display: flex;
20-
gap: var(--modus-wc-spacing-sm, 0.5rem);
39+
gap: var(--modus-wc-font-size-xs);
40+
padding: var(--modus-wc-spacing-xs) var(--modus-wc-font-size-xs);
2141

2242
.modus-wc-tree-drag-handle {
2343
left: 0;
@@ -26,6 +46,16 @@ modus-wc-tree-item {
2646

2747
.modus-wc-tree-toggle-btn {
2848
background-color: transparent;
49+
50+
&:hover,
51+
&:active,
52+
&[aria-pressed='true'] {
53+
background-color: transparent;
54+
}
55+
}
56+
57+
.modus-wc-tree-toggle-icon {
58+
color: var(--modus-wc-color-base-content);
2959
}
3060

3161
.modus-wc-tree-toggle-button-hidden {
@@ -39,7 +69,7 @@ modus-wc-tree-item {
3969
&:hover {
4070
border-radius: unset;
4171

42-
modus-wc-tree-actions .modus-wc-tree-action-button {
72+
modus-wc-tree-actions .modus-wc-tree-actions-container .modus-wc-tree-action-button {
4373
visibility: visible;
4474
}
4575
}
@@ -105,7 +135,7 @@ modus-wc-tree-item {
105135

106136
&.modus-wc-tree-dropdown-show {
107137
display: block;
108-
margin-inline-start: 1.6rem;
138+
margin-inline-start: 1.3rem;
109139
}
110140
}
111141

0 commit comments

Comments
 (0)