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

feat: update color variables #2861

Merged
merged 10 commits into from
Apr 3, 2024
10 changes: 10 additions & 0 deletions .changeset/eight-elephants-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@swisspost/design-system-styles': major
'@swisspost/internet-header': patch
'@swisspost/design-system-documentation': patch
'@swisspost/design-system-demo': patch
---

Refactored brand colors. Renamed `$gray-background` SCSS variable to `$gray` and removed `$gray-background-light` variable because it is a duplication of the already existing variable `$light`.

Updated the usage of said variables in dependant packages accordingly.
8 changes: 8 additions & 0 deletions .changeset/nice-schools-perform.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@swisspost/design-system-styles': minor
'@swisspost/design-system-documentation': minor
'@swisspost/design-system-components': patch
---

Added new black and white alpha colors.
Replaced hardcoded alpha colors with the new color definitions in `card-control` component.
13 changes: 13 additions & 0 deletions .changeset/shiny-zoos-accept.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'@swisspost/design-system-styles': major
'@swisspost/design-system-documentation': patch
'@swisspost/design-system-components': patch
'@swisspost/design-system-demo': patch
---

- Removed variables `$success-green`, `$error-red`, `$warning-orange`, `$success-text`, `$error-text`, `$danger` as well as the Sass map `$contextual-colors`.
Instead use the variables `$success`, `$error`, `$warning`, `$error` and the Sass map `$signal-colors`.
- Updated the Sass map `$signal-colors` keys and added a new Sass map `$signal-background-colors`.
- Updated the Sass map `$background-colors` and all the dependant packages accordingly.

With the exception of the components `notification`, `toast` and `tag`, there is no component providing a `danger` variant anymore. Instead use the `error` variant.
6 changes: 6 additions & 0 deletions .changeset/smart-spoons-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@swisspost/design-system-documentation': minor
'@swisspost/design-system-styles': minor
---

Added new focus color variables.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const ALERT_TYPES = ['primary', 'success', 'danger', 'warning', 'info', 'gray'] as const;
export const ALERT_TYPES = ['primary', 'success', 'warning', 'danger', 'info', 'gray'] as const;

export type AlertType = typeof ALERT_TYPES[number];
export type AlertType = (typeof ALERT_TYPES)[number];
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
}

&.is-invalid {
--post-card-control-border-color: #{post.$danger};
--post-card-control-color: #{post.$danger};
--post-card-control-input-border-color: #{post.$danger};
--post-card-control-border-color: #{post.$error};
--post-card-control-color: #{post.$error};
--post-card-control-input-border-color: #{post.$error};
}

&:hover {
Expand Down Expand Up @@ -152,10 +152,10 @@
}

&.is-invalid {
--post-card-control-border-color: #{post.$danger};
--post-card-control-border-color: #{post.$error};
--post-card-control-bg: #{post.$error-background};
--post-card-control-color: #{post.$danger};
--post-card-control-input-border-color: #{post.$danger};
--post-card-control-color: #{post.$error};
--post-card-control-input-border-color: #{post.$error};
--post-card-control-input-bg: #{post.$white};
}

Expand Down Expand Up @@ -219,10 +219,10 @@
}

&.is-invalid {
--post-card-control-border-color: #{post.$danger};
--post-card-control-border-color: #{post.$error};
--post-card-control-bg: #{post.$error-background};
--post-card-control-color: #{post.$danger};
--post-card-control-input-border-color: #{post.$danger};
--post-card-control-color: #{post.$error};
--post-card-control-input-border-color: #{post.$error};
--post-card-control-input-bg: #{post.$white};
}

Expand All @@ -244,10 +244,10 @@

// TODO: update white alpha colors with design-system alpha colors, once they are defined
&.is-disabled {
--post-card-control-border-color: #{#{rgba(post.$white, 0.8)}};
--post-card-control-border-color: post.$white-alpha-80;
--post-card-control-bg: transparent;
--post-card-control-color: #{#{rgba(post.$white, 0.8)}};
--post-card-control-input-border-color: #{#{rgba(post.$white, 0.8)}};
--post-card-control-color: post.$white-alpha-80;
--post-card-control-input-border-color: post.$white-alpha-80;
--post-card-control-input-bg: transparent;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,33 @@ <h2 class="bold mt-huge">Default backgrounds</h2>
<div class="p-3 bg-gray">
<app-background-demo
[dropOpacity]="dropOpacity1"
[colorArray]="['primary', 'yellow', 'white', 'light', 'gray', 'dark', 'transparent']"
[colorArray]="[
'yellow',
'white',
'light',
'gray',
'dark',
'primary',
'secondary',
'transparent'
]"
></app-background-demo>
</div>
</div>
<div class="col-12 col-lg-6">
<div class="p-3 bg-dark">
<app-background-demo
[dropOpacity]="dropOpacity1"
[colorArray]="['primary', 'yellow', 'white', 'light', 'gray', 'dark', 'transparent']"
[colorArray]="[
'yellow',
'white',
'light',
'gray',
'dark',
'primary',
'secondary',
'transparent'
]"
></app-background-demo>
</div>
</div>
Expand Down Expand Up @@ -129,15 +147,15 @@ <h2 class="bold mt-huge">Contextual backgrounds (Intranet only)</h2>
<div class="p-3 bg-gray">
<app-background-demo
[dropOpacity]="dropOpacity3"
[colorArray]="['success', 'warning', 'danger', 'info']"
[colorArray]="['success', 'warning', 'error', 'info']"
></app-background-demo>
</div>
</div>
<div class="col-12 col-lg-6">
<div class="p-3 bg-dark">
<app-background-demo
[dropOpacity]="dropOpacity3"
[colorArray]="['success', 'warning', 'danger', 'info']"
[colorArray]="['success', 'warning', 'error', 'info']"
></app-background-demo>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class SvgIconsDemoComponent {
packageName: string = '@swisspost/design-system-styles';
cwfImport: string = `@use "${this.packageName}/core" as post;`;

colors = ['primary', 'white', 'success', 'warning', 'danger'];
colors = ['primary', 'white', 'success', 'warning', 'error'];
preColored = ['success', 'warn', 'info', 'error-black', 'error-red'];

range: number[] = [];
Expand Down
4 changes: 2 additions & 2 deletions packages/demo/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ body {
.pi-1000-success {
@include post.pi(1000, 'success');
}
.pi-1000-danger {
@include post.pi(1000, 'danger');
.pi-1000-error {
@include post.pi(1000, 'error');
}

.pi-1014-white {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ There are a number of accent colors that you can apply to buttons instead of the

<Canvas of={ButtonStories.AccentColors} />

### Contextual colors
### Signal colors

Besides the usual and the accent button variations, there are also contextual button colors.
Besides the usual and the accent button variations, there are also signal button colors.

<p className="alert alert-warning">These are only allowed for intranet applications!</p>
<p className="alert alert-md alert-warning">These are only allowed for intranet applications!</p>

<Canvas of={ButtonStories.ContextualColors} />
<Canvas of={ButtonStories.SignalColors} />

### Full-width

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
import meta, { Default, AccentColors, ContextualColors } from './button.stories';
import meta, { Default, AccentColors, SignalColors } from './button.stories';
import { html } from 'lit';
import { bombArgs } from '../../../utils';

Expand Down Expand Up @@ -44,7 +44,7 @@ export const Button: Story = {
<div class="mt-big w-100"></div>
${AccentColors.render?.({ ...context.args, ...AccentColors.args }, context)}
<div class="mt-big w-100"></div>
${ContextualColors.render?.({ ...context.args, ...ContextualColors.args }, context)}
${SignalColors.render?.({ ...context.args, ...SignalColors.args }, context)}
</div>
`,
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,10 @@ export const AccentColors: Story = {
},
};

export const ContextualColors: Story = {
export const SignalColors: Story = {
...VariantsTemplate,
args: {
variants: ['btn-success', 'btn-info', 'btn-warning', 'btn-danger'],
variants: ['btn-success', 'btn-warning', 'btn-error', 'btn-info'],
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { parse } from '../../../utils/sass-export';
import './card-control.styles.scss';
import scss from './card-control.module.scss';

const SCSS_VARIABLES: { [key: string]: string } = parse(scss);
const SCSS_VARIABLES: any = parse(scss);

const meta: MetaComponent = {
id: '886fabcf-148b-4054-a2ec-4869668294fb',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@use 'sass:list';
@use 'sass:map';
@use '@swisspost/design-system-styles/core' as post;

$background-classes: ();

@each $key in map.keys(post.$background-colors) {
$background-classes: list.append($background-classes, 'bg-#{$key}', $separator: comma);
}

:export {
bg-classes: [$background-classes];
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Args, StoryContext, StoryObj } from '@storybook/web-components';
import { html } from 'lit';
import scss from './background.module.scss';
import { MetaComponent } from '../../../../types';
import { parse } from '../../../utils/sass-export';
import scss from './subnavigation.module.scss';

const backgroundColors = scss.bgClasses.split('"').filter((_, index) => index % 2 === 1);
const SCSS_VARIABLES: any = parse(scss);

const meta: MetaComponent = {
id: '87ceabbb-f552-46eb-8a47-4d84e7f8cef0',
Expand All @@ -25,7 +26,7 @@ const meta: MetaComponent = {
control: {
type: 'select',
},
options: ['default', ...backgroundColors],
options: ['default', ...SCSS_VARIABLES['bg-classes']],
table: {
category: 'General',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { MetaComponent } from '../../../../../types';
import { html, nothing } from 'lit';
import { BADGE } from '../../../../../.storybook/constants';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
import { parse } from '../../../../utils/sass-export';
import scss from '../tag.module.scss';

const SCSS_VARIABLES: any = parse(scss);

const meta: MetaComponent = {
id: '1b1ea384-7421-4064-ad34-e3f48a36b39f',
Expand All @@ -26,16 +30,9 @@ const meta: MetaComponent = {
type: 'select',
labels: {
null: 'Default',
gray: 'Gray',
white: 'White',
info: 'Info',
success: 'Success',
danger: 'Danger',
warning: 'Warning',
yellow: 'Yellow',
},
},
options: ['null', 'gray', 'white', 'info', 'success', 'warning', 'danger', 'yellow'],
options: ['null', ...SCSS_VARIABLES['tag-backgrounds']],
table: {
category: 'General',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@use 'sass:map';
@use '@swisspost/design-system-styles/core' as post;

:export {
tag-backgrounds: [map.keys(post.$tag-backgrounds)];
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { MetaComponent } from '../../../../../types';
import { html, nothing } from 'lit';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
import { BADGE } from '../../../../../.storybook/constants';
import { parse } from '../../../../utils/sass-export';
import scss from '../tag.module.scss';

const SCSS_VARIABLES: any = parse(scss);

const meta: MetaComponent = {
id: '516917c9-ad12-484c-8bbd-e270e412f713',
Expand All @@ -24,16 +28,9 @@ const meta: MetaComponent = {
type: 'select',
labels: {
null: 'Default',
gray: 'Gray',
white: 'White',
info: 'Info',
success: 'Success',
danger: 'Danger',
warning: 'Warning',
yellow: 'Yellow',
},
},
options: ['null', 'gray', 'white', 'info', 'success', 'warning', 'danger', 'yellow'],
options: ['null', ...SCSS_VARIABLES['tag-backgrounds']],
},
'size': {
control: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.my-element {
property: var(--post-dark);
color: var(--post-gray-80);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@use 'sass:map';
@use '@swisspost/design-system-styles/core' as post;

.my-element {
property: post.$dark;
// direct usage
color: post.$gray-80;
// map usage
color: map.get(post.$post-grays, 'gray-80');
}
Loading
Loading