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

feat(theme): add borderAccentLight #2783

Merged
merged 3 commits into from Feb 3, 2020
Merged

feat(theme): add borderAccentLight #2783

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca0d195
feat(theme): add borderAccentLight
Feb 1, 2020
a77e832
chore: add new token to vscode cheatsheet
Feb 3, 2020
6a4385a
Merge branch 'master' into token-update
sandgraham Feb 3, 2020
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
37 changes: 19 additions & 18 deletions documentation-site/pages/guides/theming.mdx
View file
Open in desktop
Expand Up @@ -171,15 +171,15 @@ import {createTheme, lightThemePrimitives} from 'baseui';

const primitives = {
...lightThemePrimitives,
accent: "#F127E4", // hot pink
accent50: "#FDEDFC",
accent100: "#FCD3F9",
accent200: "#F89FF3",
accent300: "#F45AEA",
accent400: "#F127E4",
accent500: "#B71DAD",
accent600: "#901788",
accent700: "#600F5B"
accent: '#F127E4', // hot pink
accent50: '#FDEDFC',
accent100: '#FCD3F9',
accent200: '#F89FF3',
accent300: '#F45AEA',
accent400: '#F127E4',
accent500: '#B71DAD',
accent600: '#901788',
accent700: '#600F5B',
};

const theme = createTheme(primitives);
Expand All @@ -200,15 +200,15 @@ import {createTheme, lightThemePrimitives} from 'baseui';

const primitives = {
...lightThemePrimitives,
accent: "#F127E4", // hot pink
accent50: "#FDEDFC",
accent100: "#FCD3F9",
accent200: "#F89FF3",
accent300: "#F45AEA",
accent400: "#F127E4",
accent500: "#B71DAD",
accent600: "#901788",
accent700: "#600F5B"
accent: '#F127E4', // hot pink
accent50: '#FDEDFC',
accent100: '#FCD3F9',
accent200: '#F89FF3',
accent300: '#F45AEA',
accent400: '#F127E4',
accent500: '#B71DAD',
accent600: '#901788',
accent700: '#600F5B',
};

const overrides = {
Expand Down Expand Up @@ -587,6 +587,7 @@ Control literal and semantic color values. These differ between light and dark t

<Color value="borderStateDisabled" />
<Color value="borderAccent" />
<Color value="borderAccentLight" />
<Color value="borderNegative" />
<Color value="borderWarning" />
<Color value="borderPositive" />
Expand Down
1 change: 1 addition & 0 deletions packages/baseweb-vscode-extension/src/App.tsx
View file
Open in desktop
Expand Up @@ -72,6 +72,7 @@ const COLORS = [
'contentOnColor',
'borderStateDisabled',
'borderAccent',
'borderAccentLight',
'borderNegative',
'borderWarning',
'borderPositive',
Expand Down
1 change: 1 addition & 0 deletions src/theme.ts
View file
Open in desktop
Expand Up @@ -150,6 +150,7 @@ interface Colors {
// Border
borderStateDisabled: string;
borderAccent: string;
borderAccentLight: string;
borderNegative: string;
borderWarning: string;
borderPositive: string;
Expand Down
3 changes: 2 additions & 1 deletion src/themes/dark-theme/color-semantic-tokens.js
View file
Open in desktop
Expand Up @@ -70,7 +70,8 @@ export default (

// Border
borderStateDisabled: colors.gray800,
borderAccent: colors.blue500,
borderAccent: colors.blue400,
borderAccentLight: colors.blue500,
borderNegative: colors.red500,
borderWarning: colors.yellow500,
borderPositive: colors.green500,
Expand Down
3 changes: 2 additions & 1 deletion src/themes/light-theme/color-semantic-tokens.js
View file
Open in desktop
Expand Up @@ -70,7 +70,8 @@ export default (

// Border
borderStateDisabled: colors.gray50,
borderAccent: colors.blue200,
borderAccent: colors.blue400,
borderAccentLight: colors.blue200,
borderNegative: colors.red200,
borderWarning: colors.yellow200,
borderPositive: colors.green200,
Expand Down
1 change: 1 addition & 0 deletions src/themes/types.js
View file
Open in desktop
Expand Up @@ -135,6 +135,7 @@ export type CoreExtensionSemanticColorTokensT = {
// Border
borderStateDisabled: string,
borderAccent: string,
borderAccentLight: string,
borderNegative: string,
borderWarning: string,
borderPositive: string,
Expand Down