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.

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

Update slash icon, update from XD, and and rename a few tokens #389

Merged
merged 12 commits into from
Mar 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "major",
"comment": "Renamed fillHoverSelectedColor & fillSelectedColor tokens.",
"packageName": "@ni/nimble-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
fredvisser marked this conversation as resolved.
Show resolved Hide resolved
"type": "major",
"comment": "New `forward-slash` icon. Updated color tokens - `Enterprise` is now `ForestGreen`, `Selection100` is now `DigitalGreenLight`, `Banner_Fail_100_DarkUI_` is now `Banner_Fail_100_DarkUI`. Also adds `DigitalGreenDark`, `PowerGreen`, and `Black22`.",
"packageName": "@ni/nimble-tokens",
"email": "[email protected]",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions packages/nimble-components/src/button/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
actionRgbPartialColor,
borderHoverColor,
borderWidth,
fillColorSelected,
fillSelectedColor,
standardPadding
} from '../theme-provider/design-tokens';
import { styles as buttonStyles } from '../patterns/button/styles';
Expand Down Expand Up @@ -72,7 +72,7 @@ export const styles = buttonStyles

:host(.primary) .control:active {
background-clip: border-box;
border-color: ${fillColorSelected};
border-color: ${fillSelectedColor};
border-width: ${borderWidth};
box-shadow: none;
padding: 0 ${standardPadding};
Expand Down
6 changes: 3 additions & 3 deletions packages/nimble-components/src/listbox-option/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { focusVisible } from '../utilities/style/focus';

import {
borderHoverColor,
fillColorSelected,
fillSelectedColor,
fillHoverSelectedColor,
fillHoverColor,
bodyFont,
Expand All @@ -27,7 +27,7 @@ export const styles = css`
:host(.selected) {
box-shadow: none;
outline: none;
background-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
}

:host(:hover.selected) {
Expand All @@ -52,7 +52,7 @@ export const styles = css`
:host(:active) {
box-shadow: none;
outline: none;
background-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
}

:host([disabled]) {
Expand Down
4 changes: 2 additions & 2 deletions packages/nimble-components/src/menu-item/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { focusVisible } from '../utilities/style/focus';

import {
controlHeight,
fillColorSelected,
fillSelectedColor,
fillHoverColor,
bodyFontColor,
borderHoverColor,
Expand Down Expand Up @@ -42,7 +42,7 @@ export const styles = css`
background: ${fillHoverColor};
}
:host(:active) {
background: ${fillColorSelected};
background: ${fillSelectedColor};
}
:host([disabled]) {
color: ${bodyDisabledFontColor};
Expand Down
14 changes: 7 additions & 7 deletions packages/nimble-components/src/patterns/button/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
buttonLabelFontColor,
buttonLabelDisabledFontColor,
controlHeight,
fillColorSelected,
fillSelectedColor,
iconColor,
smallDelay,
standardPadding
Expand Down Expand Up @@ -144,8 +144,8 @@ export const styles = css`
}

.control:active {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}

.control[disabled] {
Expand Down Expand Up @@ -173,8 +173,8 @@ export const styles = css`
}

.control:active {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}

.control[disabled] {
Expand Down Expand Up @@ -202,8 +202,8 @@ export const styles = css`
}

.control:active {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}

.control[disabled] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const comments: { readonly [key in TokenName]: string } = {
applicationBackgroundColor: 'Primary background color for the application',
headerBackgroundColor: 'Background color for application headers',
sectionBackgroundColor: 'Background color for dialogs and menus',
fillColorSelected: 'Control fill color when a control is selected',
fillSelectedColor: 'Control fill color when a control is selected',
fillSelectedRgbPartialColor:
'DEPRECATED: *-partial tokens are used with rgba() to set color transparency in component stylesheets',
fillHoverSelectedColor:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export const tokenNames: { readonly [key in TokenName]: string } = {
applicationBackgroundColor: 'application-background-color',
headerBackgroundColor: 'header-background-color',
sectionBackgroundColor: 'section-background-color',
fillColorSelected: 'fill-color-selected',
fillSelectedColor: 'fill-selected-color',
fillSelectedRgbPartialColor: 'fill-selected-rgb-partial-color',
fillHoverSelectedColor: 'fill-selected-hover-color',
fillHoverSelectedColor: 'fill-hover-selected-color',
fillHoverColor: 'fill-hover-color',
borderColor: 'border-color',
borderRgbPartialColor: 'border-rgb-partial-color',
Expand Down
31 changes: 18 additions & 13 deletions packages/nimble-components/src/theme-provider/design-tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
Black75,
Black80,
White,
Enterprise,
Selection100,
ForestGreen,
DigitalGreenLight,
Fail100LightUi,
SmallDelay,
MediumDelay,
Expand Down Expand Up @@ -94,27 +94,27 @@ export const actionRgbPartialColor = DesignToken.create<string>(

export const applicationBackgroundColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.applicationBackgroundColor)
).withDefault((element: HTMLElement) => getColorForTheme(element, White, Black85, Enterprise));
).withDefault((element: HTMLElement) => getColorForTheme(element, White, Black85, ForestGreen));

export const headerBackgroundColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.headerBackgroundColor)
).withDefault((element: HTMLElement) => getColorForTheme(element, Black7, Black80, Enterprise));
).withDefault((element: HTMLElement) => getColorForTheme(element, Black7, Black80, ForestGreen));

export const sectionBackgroundColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.sectionBackgroundColor)
).withDefault((element: HTMLElement) => getColorForTheme(element, Black30, Black91, Enterprise));
).withDefault((element: HTMLElement) => getColorForTheme(element, Black30, Black91, ForestGreen));

export const fillColorSelected = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.fillColorSelected)
).withDefault((element: HTMLElement) => hexToRgbaCssColor(getFillColorSelectedForTheme(element), 0.3));
export const fillSelectedColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.fillSelectedColor)
).withDefault((element: HTMLElement) => hexToRgbaCssColor(getfillSelectedColorForTheme(element), 0.3));

export const fillSelectedRgbPartialColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.fillSelectedRgbPartialColor)
).withDefault((element: HTMLElement) => hexToRgbPartial(getFillColorSelectedForTheme(element)));
).withDefault((element: HTMLElement) => hexToRgbPartial(getfillSelectedColorForTheme(element)));

export const fillHoverSelectedColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.fillHoverSelectedColor)
).withDefault((element: HTMLElement) => hexToRgbaCssColor(getFillColorSelectedForTheme(element), 0.15));
).withDefault((element: HTMLElement) => hexToRgbaCssColor(getfillSelectedColorForTheme(element), 0.15));

export const fillHoverColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.fillHoverColor)
Expand Down Expand Up @@ -142,7 +142,7 @@ export const passColor = DesignToken.create<string>(

export const borderHoverColor = DesignToken.create<string>(
styleNameFromTokenName(tokenNames.borderHoverColor)
).withDefault((element: HTMLElement) => getColorForTheme(element, Selection100, Selection100, White));
).withDefault((element: HTMLElement) => getColorForTheme(element, DigitalGreenLight, DigitalGreenLight, White));

// Component Color Tokens
export const iconColor = DesignToken.create<string>(
Expand Down Expand Up @@ -435,8 +435,13 @@ function getDefaultFontColorForTheme(element: HTMLElement): string {
return getColorForTheme(element, Black91, Black15, White);
}

function getFillColorSelectedForTheme(element: HTMLElement): string {
return getColorForTheme(element, Selection100, Selection100, White);
function getfillSelectedColorForTheme(element: HTMLElement): string {
return getColorForTheme(
element,
DigitalGreenLight,
DigitalGreenLight,
White
);
}

function getfillHoverColorForTheme(element: HTMLElement): string {
Expand Down
18 changes: 9 additions & 9 deletions packages/nimble-components/src/toggle-button/styles.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import { css } from '@microsoft/fast-element';
import { focusVisible } from '../utilities/style/focus';

import { fillColorSelected } from '../theme-provider/design-tokens';
import { fillSelectedColor } from '../theme-provider/design-tokens';
import { styles as buttonStyles } from '../patterns/button/styles';

export const styles = css`
${buttonStyles}

.control[aria-pressed='true'] {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}

.control[aria-pressed='true']:hover {
background-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
}

.control[aria-pressed='true']${focusVisible} {
background-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
}

.control[aria-pressed='true'][disabled] {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}

.control[aria-pressed='true'][disabled]:hover {
background-color: ${fillColorSelected};
border-color: ${fillColorSelected};
background-color: ${fillSelectedColor};
border-color: ${fillSelectedColor};
}
`;
4 changes: 2 additions & 2 deletions packages/nimble-components/src/tree-item/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { focusVisible } from '../utilities/style/focus';
import {
bodyFontColor,
borderHoverColor,
fillColorSelected,
fillSelectedColor,
fillHoverColor,
fillHoverSelectedColor,
borderWidth,
Expand Down Expand Up @@ -64,7 +64,7 @@ export const styles: (
}

:host([selected]) .positioning-region {
background: ${fillColorSelected};
background: ${fillSelectedColor};
}

:host([selected]) .positioning-region:hover {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading