Skip to content

Commit 90bdbd2

Browse files
Kateryna ProkopenkoDevtools-frontend LUCI CQ
authored andcommitted
[GM3Restyling] Update devtools select menu combobox styles
Bug: 368246828 Change-Id: I654daf7da478b7b536f9de9e4c8d2df2477b7d6c Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5973698 Commit-Queue: Kim-Anh Tran <[email protected]> Reviewed-by: Kim-Anh Tran <[email protected]> Auto-Submit: Kateryna Prokopenko <[email protected]>
1 parent 9667003 commit 90bdbd2

File tree

6 files changed

+44
-76
lines changed

6 files changed

+44
-76
lines changed

front_end/panels/recorder/components/recordingView.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,9 @@
300300
align-items: center;
301301
}
302302

303-
.editable-setting devtools-select-menu {
304-
height: 32px;
305-
}
306-
307303
.editable-setting .devtools-text-input {
308304
width: fit-content;
305+
height: var(--sys-size-9);
309306
}
310307

311308
.wrapping-label {

front_end/panels/recorder/components/selectButton.css

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,57 +13,13 @@
1313
position: relative; /* Needed for outline to appear on top of the next element */
1414
}
1515

16+
.select-button devtools-select-menu {
17+
position: relative;
18+
top: var(--sys-size-1);
19+
height: var(--sys-size-9);
20+
}
21+
1622
.select-menu-item-content-with-icon {
1723
display: flex;
1824
align-items: center;
1925
}
20-
21-
/* .select-menu-item-content-with-icon::before {
22-
content: "";
23-
position: relative;
24-
left: 0;
25-
top: 0;
26-
background-color: var(--sys-color-on-surface);
27-
display: inline-block;
28-
mask-repeat: no-repeat;
29-
mask-position: center;
30-
width: 24px;
31-
height: 24px;
32-
margin-right: 4px;
33-
mask-image: var(--item-mask-icon);
34-
} */
35-
36-
/* devtools-select-menu {
37-
height: var(--override-select-menu-height, 24px);
38-
border-radius: 0 4px 4px 0;
39-
box-sizing: border-box;
40-
41-
--override-select-menu-show-button-outline: var(--sys-color-state-focus-ring);
42-
--override-select-menu-label-with-arrow-padding: 0;
43-
--override-select-menu-border: none;
44-
--override-select-menu-show-button-padding: 0 6px 0 0;
45-
} */
46-
47-
/* devtools-select-menu.primary {
48-
border: none;
49-
border-left: 1px solid var(--override-icon-and-text-color);
50-
51-
--override-icon-and-text-color: var(--sys-color-cdt-base-container);
52-
--override-select-menu-arrow-color: var(--override-icon-and-text-color);
53-
--override-divider-color: var(--override-icon-and-text-color);
54-
--override-select-menu-background-color: var(--sys-color-primary);
55-
--override-select-menu-active-background-color:
56-
var(
57-
--override-select-menu-background-color
58-
);
59-
} */
60-
61-
/* devtools-select-menu.primary:hover {
62-
--override-select-menu-background-color: color-mix(in sRGB, var(--sys-color-primary), var(--sys-color-state-hover-on-prominent) 10%);
63-
} */
64-
65-
/* devtools-select-menu[disabled].primary,
66-
devtools-select-menu[disabled].primary:hover {
67-
--override-icon-and-text-color: var(--sys-color-state-disabled);
68-
--override-select-menu-background-color: var(--sys-color-cdt-base-container-elevation-1);
69-
} */

front_end/ui/components/menus/selectMenu.css

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,26 @@
66

77
:host {
88
border: 1px solid var(--sys-color-neutral-outline);
9-
border-radius: 3px;
9+
border-radius: var(--sys-shape-corner-extra-small);
1010
width: fit-content;
1111
display: flex;
1212
align-items: center;
13-
background-color: var(--override-select-menu-background-color, var(--sys-color-cdt-base-container));
13+
background-color: var(--sys-color-cdt-base-container);
1414
}
1515

1616
:host([has-open-dialog]) {
17-
background-color: var(--override-select-menu-active-background-color, var(--sys-color-neutral-container));
17+
outline: var(--sys-size-2) solid var(--sys-color-state-focus-ring);
18+
background:
19+
linear-gradient(var(--sys-color-state-hover-on-subtle), var(--sys-color-state-hover-on-subtle)),
20+
linear-gradient(var(--sys-color-state-ripple-neutral-on-subtle), var(--sys-color-state-ripple-neutral-on-subtle));
1821
}
1922

2023
button {
2124
background: none;
2225
}
2326

2427
#side-button {
25-
border: 1px solid var(--override-select-menu-border, var(--sys-color-neutral-outline));
28+
border: 1px solid var(--sys-color-neutral-outline);
2629
border-radius: 3px 0 0 3px;
2730
border-right: none;
2831
height: 100%;
@@ -31,7 +34,7 @@ button {
3134
}
3235

3336
button:disabled {
34-
cursor: not-allowed;
37+
pointer-events: none;
3538
}
3639

3740
@keyframes slideIn {

front_end/ui/components/menus/selectMenuButton.css

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
:host {
8-
height: 100%;
8+
height: var(--sys-size-9);
99
width: 100%;
1010
display: block;
1111
}
@@ -17,13 +17,27 @@
1717
height: 100%;
1818
width: 100%;
1919
border: none;
20-
border-radius: var(--override-select-menu-show-button-border-radius);
21-
padding: var(--override-select-menu-show-button-padding, 1px 6px);
22-
}
20+
border-radius: var(--sys-shape-corner-extra-small);
21+
padding: 0 var(--sys-size-4) 0 var(--sys-size-5);
22+
23+
&:hover {
24+
background-color: var(--sys-color-state-hover-on-subtle);
25+
}
26+
27+
&:active {
28+
background-color: var(--sys-color-state-ripple-neutral-on-subtle);
29+
}
2330

24-
.show:focus-visible {
25-
outline: 2px solid var(--sys-color-state-focus-ring);
26-
outline-offset: 2px;
31+
&:hover:active {
32+
background:
33+
linear-gradient(var(--sys-color-state-hover-on-subtle), var(--sys-color-state-hover-on-subtle)),
34+
linear-gradient(var(--sys-color-state-ripple-neutral-on-subtle), var(--sys-color-state-ripple-neutral-on-subtle));
35+
}
36+
37+
&:focus-visible {
38+
outline: var(--sys-size-2) solid var(--sys-color-state-focus-ring);
39+
outline-offset: -1px;
40+
}
2741
}
2842

2943
#button-label-wrapper {
@@ -45,7 +59,7 @@
4559
}
4660

4761
#label[witharrow] {
48-
padding: var(--override-select-menu-label-with-arrow-padding, 0 10px 0 0);
62+
padding: 0 10px 0 0;
4963
text-align: left;
5064
}
5165

@@ -62,15 +76,12 @@
6276
height: 14px;
6377
display: inline-block;
6478
mask-repeat: no-repeat;
65-
background-color: var(--override-throttling-icon-and-text-color, var(--override-select-menu-arrow-color, var(--sys-color-on-surface)));
66-
transform: rotate(var(--arrow-angle));
67-
transform-origin: center;
68-
transition: 200ms;
79+
background-color: var(--sys-color-on-surface-subtle);
6980
}
7081

7182
.single-arrow {
7283
border-radius: 0 3px 3px 0;
73-
border: 1px solid var(--override-select-menu-border, var(--sys-color-neutral-outline));
84+
border: var(--sys-size-1) solid var(--sys-color-neutral-outline);
7485
height: 100%;
7586
aspect-ratio: 1 / 1;
7687
padding: 0;
@@ -79,14 +90,15 @@
7990
align-items: center;
8091
}
8192

82-
button[aria-expanded="true"] #arrow {
83-
transform: rotate(calc(var(--arrow-angle) + 180deg));
84-
}
85-
8693
button {
8794
background: none;
8895
}
8996

9097
button[disabled] {
9198
color: var(--sys-color-state-disabled);
99+
background-color: var(--sys-color-state-disabled-container);
100+
101+
#arrow {
102+
background-color: var(--sys-color-state-disabled);
103+
}
92104
}
386 Bytes
Loading
375 Bytes
Loading

0 commit comments

Comments
 (0)