Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use default btn styles only on opt-in #185313

Merged
merged 1 commit into from
Jun 16, 2023
Merged

use default btn styles only on opt-in #185313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 38 additions & 27 deletions src/vs/base/browser/ui/button/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,6 @@
text-decoration: none !important;
}

.monaco-button {
color: var(--vscode-button-foreground);
background-color: var(--vscode-button-background);
}

.monaco-button:hover {
background-color: var(--vscode-button-hoverBackground);
}

.monaco-button.secondary {
color: var(--vscode-button-secondaryForeground);
background-color: var(--vscode-button-secondaryBackground);
}

.monaco-button.secondary:hover {
background-color: var(--vscode-button-secondaryHoverBackground);
}


.monaco-button.disabled:focus,
.monaco-button.disabled {
opacity: 0.4 !important;
Expand Down Expand Up @@ -109,19 +90,11 @@
.monaco-button-dropdown .monaco-button-dropdown-separator {
padding: 4px 0;
cursor: default;
background-color: var(--vscode-button-background);
border-top: 1px solid var(--vscode-button-border);
border-bottom: 1px solid var(--vscode-button-border);
}

.monaco-button.secondary + .monaco-button-dropdown-separator {
background-color: var(--vscode-button-secondaryBackground);
}

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

.monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
Expand Down Expand Up @@ -159,3 +132,41 @@
margin: 0 0.2em;
color: inherit !important;
}

/* default color styles - based on CSS variables */

.monaco-button.default-colors,
.monaco-button-dropdown.default-colors > .monaco-button{
color: var(--vscode-button-foreground);
background-color: var(--vscode-button-background);
}

.monaco-button.default-colors:hover,
.monaco-button-dropdown.default-colors > .monaco-button:hover {
background-color: var(--vscode-button-hoverBackground);
}

.monaco-button.default-colors.secondary,
.monaco-button-dropdown.default-colors > .monaco-button.secondary {
color: var(--vscode-button-secondaryForeground);
background-color: var(--vscode-button-secondaryBackground);
}

.monaco-button.default-colors.secondary:hover,
.monaco-button-dropdown.default-colors > .monaco-button.secondary:hover {
background-color: var(--vscode-button-secondaryHoverBackground);
}

.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator {
background-color: var(--vscode-button-background);
border-top: 1px solid var(--vscode-button-border);
border-bottom: 1px solid var(--vscode-button-border);
}

.monaco-button-dropdown.default-colors .monaco-button.secondary + .monaco-button-dropdown-separator {
background-color: var(--vscode-button-secondaryBackground);
}

.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator > div {
background-color: var(--vscode-button-separator);
}
1 change: 1 addition & 0 deletions src/vs/platform/actions/browser/buttonbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export class MenuWorkbenchButtonBar extends ButtonBar {
}

btn.enabled = action.enabled;
btn.element.classList.add('default-colors');
if (conifgProvider(action)?.showLabel ?? true) {
btn.label = action.label;
} else {
Expand Down