Skip to content

Commit 61ba389

Browse files
authored
use default btn styles only on opt-in (microsoft#185313)
1 parent bc472a4 commit 61ba389

File tree

2 files changed

+39
-27
lines changed

2 files changed

+39
-27
lines changed

src/vs/base/browser/ui/button/button.css

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,6 @@
2525
text-decoration: none !important;
2626
}
2727

28-
.monaco-button {
29-
color: var(--vscode-button-foreground);
30-
background-color: var(--vscode-button-background);
31-
}
32-
33-
.monaco-button:hover {
34-
background-color: var(--vscode-button-hoverBackground);
35-
}
36-
37-
.monaco-button.secondary {
38-
color: var(--vscode-button-secondaryForeground);
39-
background-color: var(--vscode-button-secondaryBackground);
40-
}
41-
42-
.monaco-button.secondary:hover {
43-
background-color: var(--vscode-button-secondaryHoverBackground);
44-
}
45-
46-
4728
.monaco-button.disabled:focus,
4829
.monaco-button.disabled {
4930
opacity: 0.4 !important;
@@ -109,19 +90,11 @@
10990
.monaco-button-dropdown .monaco-button-dropdown-separator {
11091
padding: 4px 0;
11192
cursor: default;
112-
background-color: var(--vscode-button-background);
113-
border-top: 1px solid var(--vscode-button-border);
114-
border-bottom: 1px solid var(--vscode-button-border);
115-
}
116-
117-
.monaco-button.secondary + .monaco-button-dropdown-separator {
118-
background-color: var(--vscode-button-secondaryBackground);
11993
}
12094

12195
.monaco-button-dropdown .monaco-button-dropdown-separator > div {
12296
height: 100%;
12397
width: 1px;
124-
background-color: var(--vscode-button-separator);
12598
}
12699

127100
.monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
@@ -159,3 +132,41 @@
159132
margin: 0 0.2em;
160133
color: inherit !important;
161134
}
135+
136+
/* default color styles - based on CSS variables */
137+
138+
.monaco-button.default-colors,
139+
.monaco-button-dropdown.default-colors > .monaco-button{
140+
color: var(--vscode-button-foreground);
141+
background-color: var(--vscode-button-background);
142+
}
143+
144+
.monaco-button.default-colors:hover,
145+
.monaco-button-dropdown.default-colors > .monaco-button:hover {
146+
background-color: var(--vscode-button-hoverBackground);
147+
}
148+
149+
.monaco-button.default-colors.secondary,
150+
.monaco-button-dropdown.default-colors > .monaco-button.secondary {
151+
color: var(--vscode-button-secondaryForeground);
152+
background-color: var(--vscode-button-secondaryBackground);
153+
}
154+
155+
.monaco-button.default-colors.secondary:hover,
156+
.monaco-button-dropdown.default-colors > .monaco-button.secondary:hover {
157+
background-color: var(--vscode-button-secondaryHoverBackground);
158+
}
159+
160+
.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator {
161+
background-color: var(--vscode-button-background);
162+
border-top: 1px solid var(--vscode-button-border);
163+
border-bottom: 1px solid var(--vscode-button-border);
164+
}
165+
166+
.monaco-button-dropdown.default-colors .monaco-button.secondary + .monaco-button-dropdown-separator {
167+
background-color: var(--vscode-button-secondaryBackground);
168+
}
169+
170+
.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator > div {
171+
background-color: var(--vscode-button-separator);
172+
}

src/vs/platform/actions/browser/buttonbar.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export class MenuWorkbenchButtonBar extends ButtonBar {
8888
}
8989

9090
btn.enabled = action.enabled;
91+
btn.element.classList.add('default-colors');
9192
if (conifgProvider(action)?.showLabel ?? true) {
9293
btn.label = action.label;
9394
} else {

0 commit comments

Comments
 (0)