Skip to content

Add fallback styles for Button #311

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

Merged
bendera merged 1 commit into from
Feb 8, 2025
Merged

Add fallback styles for Button #311

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions dev/vscode-button/fallback-styles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>VSCode Elements</title>
<link
rel="stylesheet"
href="/node_modules/@vscode/codicons/dist/codicon.css"
id="vscode-codicon-stylesheet"
/>
<script type="module" src="/dist/main.js"></script>
<script>
const logEvents = (selector, eventType) => {
document.querySelector(selector).addEventListener(eventType, (ev) => {
console.log(ev);
});
};
</script>
</head>

<body style="background-color: #1f1f1f;">
<main>
<p><vscode-button>Button</vscode-button></p>
<p><vscode-button secondary>Secondary</vscode-button></p>
</main>
</body>
</html>
41 changes: 22 additions & 19 deletions src/vscode-button/vscode-button.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
import {css, CSSResultGroup} from 'lit';
import {css, CSSResultGroup, unsafeCSS} from 'lit';
import defaultStyles from '../includes/default.styles.js';
import {getDefaultFontStack} from '../includes/helpers.js';

const defaultFontStack = unsafeCSS(getDefaultFontStack());

const styles: CSSResultGroup = [
defaultStyles,
css`
:host {
background-color: var(--vscode-button-background);
background-color: var(--vscode-button-background, #0078d4);
border-color: var(
--vscode-button-border,
var(--vscode-button-background)
var(--vscode-button-background, rgba(255, 255, 255, 0.07))
);
border-style: solid;
border-radius: 2px;
border-width: 1px;
color: var(--vscode-button-foreground);
color: var(--vscode-button-foreground, #ffffff);
cursor: pointer;
display: inline-block;
font-family: var(--vscode-font-family);
font-size: var(--vscode-font-size);
font-weight: var(--vscode-font-weight);
font-family: var(--vscode-font-family, ${defaultFontStack});
font-size: var(--vscode-font-size, 13px);
font-weight: var(--vscode-font-weight, normal);
line-height: 22px;
overflow: hidden;
padding: 1px 13px;
Expand All @@ -27,11 +30,11 @@ const styles: CSSResultGroup = [
}

:host([secondary]) {
color: var(--vscode-button-secondaryForeground);
background-color: var(--vscode-button-secondaryBackground);
color: var(--vscode-button-secondaryForeground, #cccccc);
background-color: var(--vscode-button-secondaryBackground, #313131);
border-color: var(
--vscode-button-border,
var(--vscode-button-secondaryBackground)
var(--vscode-button-secondaryBackground, rgba(255, 255, 255, 0.07))
);
}

Expand All @@ -42,19 +45,19 @@ const styles: CSSResultGroup = [
}

:host(:hover) {
background-color: var(--vscode-button-hoverBackground);
background-color: var(--vscode-button-hoverBackground, #026ec1);
}

:host([disabled]:hover) {
background-color: var(--vscode-button-background);
background-color: var(--vscode-button-background, #0078d4);
}

:host([secondary]:hover) {
background-color: var(--vscode-button-secondaryHoverBackground);
background-color: var(--vscode-button-secondaryHoverBackground, #3c3c3c);
}

:host([secondary][disabled]:hover) {
background-color: var(--vscode-button-secondaryBackground);
background-color: var(--vscode-button-secondaryBackground, #313131);
}

:host(:focus),
Expand All @@ -63,22 +66,22 @@ const styles: CSSResultGroup = [
}

:host(:focus) {
background-color: var(--vscode-button-hoverBackground);
outline: 1px solid var(--vscode-focusBorder);
background-color: var(--vscode-button-hoverBackground, #026ec1);
outline: 1px solid var(--vscode-focusBorder, #0078d4);
outline-offset: 2px;
}

:host([disabled]:focus) {
background-color: var(--vscode-button-background);
background-color: var(--vscode-button-background,#0078d4);
outline: 0;
}

:host([secondary]:focus) {
background-color: var(--vscode-button-secondaryHoverBackground);
background-color: var(--vscode-button-secondaryHoverBackground, #3c3c3c);
}

:host([secondary][disabled]:focus) {
background-color: var(--vscode-button-secondaryBackground);
background-color: var(--vscode-button-secondaryBackground, #313131);
}

::slotted(*) {
Expand Down
22 changes: 11 additions & 11 deletions src/vscode-button/vscode-button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import {ifDefined} from 'lit/directives/if-defined.js';
*
* @fires vsc-click Dispatched only when button is not in disabled state.
*
* @cssprop --vscode-button-background
* @cssprop --vscode-button-foreground
* @cssprop [--vscode-button-border=var(--vscode-button-background)]
* @cssprop --vscode-button-hoverBackground
* @cssprop --vscode-font-family
* @cssprop --vscode-font-size
* @cssprop --vscode-font-weight
* @cssprop --vscode-button-secondaryForeground
* @cssprop --vscode-button-secondaryBackground
* @cssprop --vscode-button-secondaryHoverBackground
* @cssprop --vscode-focusBorder
* @cssprop [--vscode-button-background=#0078d4]
* @cssprop [--vscode-button-foreground=#ffffff]
* @cssprop [--vscode-button-border=var(--vscode-button-background, rgba(255, 255, 255, 0.07))]
* @cssprop [--vscode-button-hoverBackground=#026ec1]
* @cssprop [--vscode-font-family=sans-serif] - A sans-serif font type depends on the host OS.
* @cssprop [--vscode-font-size=13px]
* @cssprop [--vscode-font-weight=normal]
* @cssprop [--vscode-button-secondaryForeground=#cccccc]
* @cssprop [--vscode-button-secondaryBackground=#313131]
* @cssprop [--vscode-button-secondaryHoverBackground=#3c3c3c]
* @cssprop [--vscode-focusBorder=#0078d4]
*/
@customElement('vscode-button')
export class VscodeButton extends VscElement {
Expand Down