Skip to content

Commit 397bdd9

Browse files
Kateryna ProkopenkoDevtools-frontend LUCI CQ
authored andcommitted
[GM3Restyling] Update ToolbarCombobox styles
Screenshot: https://imgur.com/a/1Hyqo7H Bug: 368246828 Change-Id: I7ba76c20f3ef481dc01c6bcdff0107fcc225310c Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5961597 Reviewed-by: Kim-Anh Tran <[email protected]> Commit-Queue: Kim-Anh Tran <[email protected]> Commit-Queue: Kateryna Prokopenko <[email protected]> Auto-Submit: Kateryna Prokopenko <[email protected]>
1 parent b33f10f commit 397bdd9

File tree

1 file changed

+34
-18
lines changed

1 file changed

+34
-18
lines changed

front_end/ui/legacy/toolbar.css

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,17 @@ devtools-issue-counter.main-toolbar {
8282
.toolbar-dropdown-arrow {
8383
pointer-events: none;
8484
flex: none;
85-
top: 1px;
85+
top: 2px;
8686
}
8787

8888
.toolbar-select-container .toolbar-dropdown-arrow {
89-
left: -5px;
89+
left: -7px;
9090
}
9191

9292
.toolbar-button.dark-text .toolbar-dropdown-arrow {
9393
color: var(--sys-color-on-surface);
9494
}
9595

96-
select.toolbar-item:disabled + .toolbar-dropdown-arrow {
97-
opacity: 50%;
98-
}
9996
/* Toolbar item */
10097

10198
.toolbar-button {
@@ -322,29 +319,51 @@ it. */
322319
.toolbar-select-container {
323320
display: inline-flex;
324321
flex-shrink: 0;
325-
margin-right: 6px;
322+
padding-left: 2px;
326323
}
327324

328325
select.toolbar-item {
329-
min-width: 38px;
326+
min-width: var(--sys-size-14);
330327
appearance: none;
331-
border: 1px solid transparent;
332-
padding: 0 13px 0 5px;
328+
padding: 0 var(--sys-size-9) 0 var(--sys-size-5);
333329
margin-right: -10px;
334330
position: relative;
335-
height: 22px;
336-
margin-top: 2px;
337-
margin-bottom: 2px;
331+
height: var(--sys-size-9);
332+
border-radius: var(--sys-shape-corner-extra-small);
333+
334+
&:disabled,
335+
&:disabled:hover,
336+
&:disabled:active,
337+
&:disabled:hover:active {
338+
background-color: var(--sys-color-state-disabled-container);
339+
color: var(--sys-color-state-disabled);
340+
341+
& + .toolbar-dropdown-arrow {
342+
color: var(--sys-color-state-disabled);
343+
}
344+
}
345+
346+
&:hover {
347+
background-color: var(--sys-color-state-hover-on-subtle);
348+
}
349+
350+
&:active {
351+
background-color: var(--sys-color-state-ripple-neutral-on-subtle);
352+
}
353+
354+
&:hover:active {
355+
background:
356+
linear-gradient(var(--sys-color-state-hover-on-subtle), var(--sys-color-state-hover-on-subtle)),
357+
linear-gradient(var(--sys-color-state-ripple-neutral-on-subtle), var(--sys-color-state-ripple-neutral-on-subtle));
358+
}
338359
}
339360

340361
button.toolbar-item:focus-visible,
341362
select.toolbar-item:focus-visible {
342-
background: var(--sys-color-state-hover-on-subtle);
343-
border-radius: 2px;
363+
outline: var(--sys-size-2) solid var(--sys-color-state-focus-ring);
344364

345365
&.toolbar-has-dropdown {
346366
background: none;
347-
border-radius: var(--sys-shape-corner-extra-small);
348367
}
349368
}
350369

@@ -353,9 +372,6 @@ select.toolbar-item:focus-visible > * {
353372
border-radius: 7px;
354373
}
355374

356-
select.toolbar-item:not(.toolbar-has-dropdown):disabled {
357-
opacity: 50%;
358-
}
359375
/* Input */
360376

361377
.toolbar-input {

0 commit comments

Comments
 (0)