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

refactor: use new semantic tokens #759

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ffb2d71
refactor: use semantic tokens in modal (poc)
acstll Dec 23, 2021
85c138c
Merge branch 'main' into refactor/semantic-tokens
Dec 23, 2021
575b250
style: format
acstll Dec 23, 2021
2ebb257
Merge branch 'refactor/semantic-tokens' of github.com:telekom/scale i…
acstll Dec 23, 2021
bac598e
Merge branch 'main' into refactor/semantic-tokens
Jan 19, 2022
1c9ccec
refactor: update temporary tokens CSS file with latest
Jan 21, 2022
067090b
Merge branch 'main' into refactor/semantic-tokens
Jan 21, 2022
3a20bbd
feat(storybook): add simple dark mode switch, load tokens from npm
Jan 28, 2022
fecb0fc
chore: remove old css file
Jan 28, 2022
fc28974
style: format
Jan 28, 2022
4c3f8ea
refactor: semantic tokens fw (#819)
felix-ico Jan 31, 2022
18acb71
refactor: update spacing variable name as defined in design token pac…
felix-ico Jan 31, 2022
453fa1f
fix(storybook): color variable for fonts
Jan 31, 2022
c74d980
fix(storybook): color variable for fonts (usage file)
Jan 31, 2022
2100a8f
refactor: semantic tokens fix conflicts (#830)
felix-ico Jan 31, 2022
3c31577
fix: remove token spacing dash, rename ui token from normal to regula…
maomaoZH Feb 1, 2022
8b2e3de
refactor: semantic tokens fw (#831)
felix-ico Feb 1, 2022
ff7c3b2
Merge branch 'refactor/semantic-tokens' of github.com:telekom/scale i…
Feb 1, 2022
b37965d
refactor: semantic tokens fw (#835)
felix-ico Feb 1, 2022
c7005c0
Refactor/semantic tokens mm (#844)
maomaoZH Feb 3, 2022
defe7ce
refactor(switch): use semantic tokens
Feb 3, 2022
cae5d04
fix(switch): disabled color tokens
Feb 3, 2022
e1808f1
fix(switch): disabled color transparency issue, use transition tokens
Feb 3, 2022
7bc9992
Merge branch 'main' into refactor/semantic-tokens
Feb 3, 2022
1d7d79d
style: format
Feb 3, 2022
a99dbe5
refactor: semantic tokens (modal) (#849)
Feb 7, 2022
950442e
fix(textarea): semantic tokens and improved label (#856)
maomaoZH Feb 9, 2022
7b4c5ff
feat(storybook): color mode switch (#855)
nowseemee Feb 9, 2022
14d01a5
refactor: address FIXME:TOKEN (#857)
Feb 10, 2022
86a48d0
Merge branch 'main' into refactor/semantic-tokens
Feb 10, 2022
7108616
chore: use latest alpha from @telekom/design-tokens
Feb 14, 2022
4c11cc3
Refactor/implement designtokens alpha8 (#869)
felix-ico Feb 18, 2022
0c53366
refactor: remove unused folder
felix-ico Feb 18, 2022
717f1b5
refactor: remove & fix some code comments, some more token updates
felix-ico Feb 18, 2022
524b194
refactor: update table
felix-ico Feb 18, 2022
960e114
fix: text-field, textarea, date-picker, dropdown border error color (…
maomaoZH Feb 21, 2022
c1f77a4
Refactor/semantic tokens fix fw (#884)
felix-ico Feb 21, 2022
1b3da25
docs(colors): better color mode switch (#886)
nowseemee Feb 22, 2022
724e424
fix: modal storybook input field, update date picker border hover col…
maomaoZH Feb 22, 2022
911ecb1
Refactor/semantic tokens fw part2 (#891)
felix-ico Feb 22, 2022
bfd0e43
refactor: update switch pressed states
felix-ico Feb 22, 2022
4f3ed1b
refactor: format
felix-ico Feb 22, 2022
38cdd89
refactor: updated scoped variables in storybook (#893)
felix-ico Feb 23, 2022
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
1 change: 1 addition & 0 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"@popperjs/core": "2.6.0",
"@proyecto26/animatable-component": "^1.1.8",
"@stencil/core": "^2.7.1",
"@telekom/design-tokens": "^1.0.0-alpha.8",
"@telekom/scale-design-tokens": "^3.0.0-beta.48",
"classnames": "^2.2.6",
"stencil-inline-svg": "^1.0.1",
Expand Down
23 changes: 12 additions & 11 deletions packages/components/src/components/breadcrumb/breadcrumb.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,23 @@
*/

:host {
--spacing-left: calc(-1 * var(--scl-spacing-8));
--spacing-left: calc(-1 * var(--telekom-spacing-unit-x2));

--font-size-list-item: var(--scl-font-size-14);
--font-size-list-item: var(--telekom-typography-font-size-caption);

--color-separator: var(--scl-color-grey-60);
--color-separator: var(--telekom-color-ui-additional-regular);

--spacing-y-item: var(--scl-spacing-4);
--spacing-x-item: var(--scl-spacing-8);
--spacing-y-item: var(--telekom-spacing-unit-x1);
--spacing-x-item: var(--telekom-spacing-unit-x2);

--color-link: var(--scl-color-grey-60);
--radius-link: var(--scl-radius-8);
--color-link-hover: var(--scl-color-primary-hover);
--color-link-active: var(--scl-color-primary-active);
--box-shadow-link-focus: 0 0 0 var(--scl-spacing-2) var(--scl-color-focus);
--color-link: var(--telekom-color-text-and-icon-additional);
--radius-link: var(--telekom-radius-standard);
--color-link-hover: var(--telekom-color-text-and-icon-primary-hovered);
--color-link-active: var(--telekom-color-text-and-icon-primary-pressed);
--box-shadow-link-focus: 0 0 0 var(--telekom-line-weight-highlight)
var(--telekom-color-functional-focus);

--color-current: var(--scl-color-text-standard);
--color-current: var(--telekom-color-text-and-icon-standard);
}

.breadcrumb {
Expand Down
86 changes: 54 additions & 32 deletions packages/components/src/components/button/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,63 @@

:host {
--width: auto;
--spacing-x: var(--scl-spacing-24);
--spacing-x-icon-only: var(--scl-spacing-8);
--min-height: var(--scl-spacing-40);
--radius: var(--scl-radius-8);
--transition: all var(--scl-motion-duration-fast)
var(--scl-motion-easing-standard);
--box-shadow-focus: 0 0 0 var(--scl-spacing-2) var(--scl-color-focus);
--font-weight: var(--scl-font-weight-bold);
--font-size: var(--scl-font-size-16);
--line-height: var(--scl-font-line-height-150);
--spacing-icon-x: var(--scl-spacing-8);
--spacing-x: var(--telekom-spacing-unit-x6);
--spacing-x-icon-only: var(--telekom-spacing-unit-x2);
--min-height: var(--telekom-spacing-unit-x10);
--radius: var(--telekom-radius-standard);
--transition: all var(--telekom-motion-duration-transition)
cubic-bezier(var(--telekom-motion-easing-standard));
--box-shadow-focus: 0 0 0 var(--telekom-line-weight-highlight)
var(--telekom-color-functional-focus);
--font-weight: var(--telekom-typography-font-weight-bold);
--font-size: var(--telekom-typography-font-size-body);
--line-height: var(--telekom-typography-line-spacing-standard);
--spacing-icon-x: var(--telekom-spacing-unit-x2);
--vertical-align: middle;

/* size: small */
--font-size-small: var(--scl-font-size-12);
--line-height-small: var(--scl-font-line-height-133);
--min-height-small: var(--scl-spacing-32);
--font-size-small: var(--telekom-typography-font-size-small);
--line-height-small: var(--telekom-typography-line-spacing-standard);
--min-height-small: var(--telekom-spacing-unit-x8);

/* variant: primary */
--radius-primary: var(--radius);
--background-primary: var(--scl-color-primary);
--background-primary-hover: var(--scl-color-primary-hover);
--background-primary-active: var(--scl-color-primary-active);
--background-primary-disabled: var(--scl-color-background-disabled);
--color-primary: var(--scl-color-white);
--color-primary-disabled: var(--scl-color-grey-40);
--background-primary: var(--telekom-color-primary-standard);
--background-primary-hover: var(--telekom-color-primary-hovered);
--background-primary-active: var(--telekom-color-primary-pressed);
--background-primary-disabled: var(--telekom-color-ui-solid-disabled);
--color-primary: var(--telekom-color-text-and-icon-white-standard);
--color-primary-disabled: var(--telekom-color-text-and-icon-disabled);

/* variant: secondary */
--radius-secondary: var(--radius);
--border-width-secondary: var(--scl-spacing-1);
--border-width-secondary: var(--telekom-spacing-unit-x025);
--background-secondary: transparent;
--color-secondary: var(--scl-color-text-standard);
--color-secondary-hover: var(--scl-color-primary-hover);
--color-secondary-active: var(--scl-color-primary-active);
--color-secondary-disabled: var(--scl-color-background-disabled);
--color-secondary: var(--telekom-color-text-and-icon-standard);
--color-secondary-hover: var(--telekom-color-text-and-icon-standard);
--color-secondary-active: var(--telekom-color-text-and-icon-standard);
--color-secondary-disabled: var(--telekom-color-text-and-icon-disabled);
--background-secondary: var(--telekom-color-ui-outlined-fill-standard);
--background-secondary-hover: var(--telekom-color-ui-outlined-fill-hovered);
--background-secondary-active: var(--telekom-color-ui-outlined-fill-pressed);
--background-secondary-disabled: var(
--telekom-color-ui-outlined-fill-disabled
);
--border-secondary: var(--telekom-color-ui-outlined-border-standard);
--border-secondary-hover: var(--telekom-color-ui-outlined-border-hovered);
--border-secondary-active: var(--telekom-color-ui-outlined-border-pressed);
--border-secondary-focus: var(--telekom-color-functional-focus);

/* variant: ghost */
--radius-ghost: var(--radius);
--border-width-ghost: var(--scl-spacing-1);
--spacing-x-ghost: var(--scl-spacing-8);
--color-ghost: var(--scl-color-primary);
--color-ghost-hover: var(--scl-color-primary-hover);
--color-ghost-active: var(--scl-color-primary-active);
--color-ghost-disabled: var(--scl-color-text-disabled);
--border-width-ghost: var(--telekom-spacing-unit-x025);
--spacing-x-ghost: var(--telekom-spacing-unit-x2);
--color-ghost: var(--telekom-color-text-and-icon-primary-standard);
--color-ghost-hover: var(--telekom-color-text-and-icon-primary-hovered);
--color-ghost-active: var(--telekom-color-text-and-icon-primary-pressed);
--color-ghost-disabled: var(--telekom-color-text-and-icon-disabled);
--background-ghost-hover: var(--telekom-color-ui-ghost-hovered);
--background-ghost-active: var(--telekom-color-ui-ghost-pressed);
}

.button {
Expand Down Expand Up @@ -98,7 +111,7 @@
top: 0;
left: 0;
width: 100%;
border: var(--scl-spacing-1) solid transparent;
border: var(--telekom-spacing-unit-x025) solid transparent;
height: 100%;
content: '';
display: block;
Expand Down Expand Up @@ -149,15 +162,22 @@
border-radius: var(--radius-secondary);
border: var(--border-width-secondary) solid currentColor;
color: var(--color-secondary);
background-color: var(--background-secondary);
border-color: var(--border-secondary);
}
.button--variant-secondary:not(.button--disabled):hover {
color: var(--color-secondary-hover);
background-color: var(--background-secondary-hover);
border-color: var(--border-secondary-hover);
}
.button--variant-secondary:not(.button--disabled):active {
color: var(--color-secondary-active);
background-color: var(--background-secondary-active);
border-color: var(--border-secondary-active);
}
.button--disabled.button--variant-secondary {
color: var(--color-secondary-disabled);
background-color: var(--background-secondary-disabled);
}

.button--variant-ghost {
Expand All @@ -171,9 +191,11 @@
}
.button--variant-ghost:not(.button--disabled):hover {
color: var(--color-ghost-hover);
background-color: var(--background-ghost-hover);
}
.button--variant-ghost:not(.button--disabled):active {
color: var(--color-ghost-active);
background-color: var(--background-ghost-active);
}
.button--disabled.button--variant-ghost {
color: var(--color-ghost-disabled);
Expand Down
21 changes: 12 additions & 9 deletions packages/components/src/components/callout/callout.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
:host {
--inner-width-small: var(--scl-spacing-80);
--inner-height-small: var(--scl-spacing-80);
--inner-width-small: var(--telekom-spacing-unit-x20);
--inner-height-small: var(--telekom-spacing-unit-x20);
--inner-width-large: 126.5px;
--inner-height-large: 96px;
--width-small: 120px;
--height-small: 120px;
--height-large: 160px;
--width-large: 160px;
--color-blue: var(--scl-color-blue-60);
--color-white: var(--scl-color-white);
--color-black: var(--scl-color-grey-90);
--color-primary: var(--scl-color-primary);
--font-family: var(--scl-font-family-sans);
--font-size: calc(var(--scl-font-size-20) * 3);
--font-size-prefix: var(--scl-font-size-20);
/* FIXME variables shouldn't have color names */
--color-blue: var(--telekom-color-additional-blue-600);
/* FIXME variables are used sometimes as background and sometimes as font color */
--color-white: var(--telekom-color-background-surface);
--color-black: var(--telekom-color-text-and-icon-functional-black);
--color-primary: var(--telekom-color-primary-standard);
--font-family: var(--telekom-typography-font-family-sans);
/* FIXME is this calc necessary? */
--font-size: calc(var(--telekom-typography-font-size-callout) * 3);
--font-size-prefix: var(--telekom-typography-font-size-callout);
}

.callout {
Expand Down
21 changes: 11 additions & 10 deletions packages/components/src/components/card/card.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
*/

:host {
--background: var(--scl-color-background-standard);
--transition: all var(--scl-motion-duration-fast)
var(--scl-motion-easing-standard);
--radius: var(--scl-radius-12);
--box-shadow: var(--scl-shadow-level-1);
--box-shadow-hover: var(--scl-shadow-level-1-hover);
--box-shadow-focus: 0 0 0 var(--scl-spacing-2) var(--scl-color-focus);
--box-shadow-active: var(--scl-shadow-level-1-active);
--background: var(--telekom-color-background-surface);
--transition: all var(--telekom-motion-duration-transition)
cubic-bezier(var(--telekom-motion-easing-standard));
--radius: var(--telekom-radius-large);
--box-shadow: var(--telekom-shadow-raised-standard);
--box-shadow-hover: var(--telekom-shadow-raised-hover);
--box-shadow-focus: 0 0 0 var(--telekom-line-weight-highlight)
var(--telekom-color-functional-focus);
--box-shadow-active: var(--telekom-shadow-raised-pressed);

--spacing-body: var(--scl-spacing-24);
--spacing-body: var(--telekom-spacing-unit-x6);

--spacing-body-slotted: 0;
--spacing-body-slotted-interactive: 0;
Expand Down Expand Up @@ -60,7 +61,7 @@
}

.card--interactive:focus {
box-shadow: var(--scl-shadow-level-1-hover), var(--box-shadow-focus);
box-shadow: var(--telekom-shadow-raised-hover), var(--box-shadow-focus);
}

.card--interactive:active {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,60 @@
*/

:host {
--scl-chart-stack-card-color: var(--scl-color-blue-60);
--scl-chart-stack-card-color: var(--telekom-color-blue-600);
}
.chart-stack-card {
color: var(--color-text);
--scl-chart-stack-card-color: var(--scl-color-blue-60);
--scl-chart-stack-card-color: var(--telekom-color-blue-600);
}
.chart-stack-card .header {
height: var(--scl-spacing-24);
font-size: var(--scl-font-size-24);
font-weight: var(--scl-font-weight-extrabold);
line-height: var(--scl-font-line-height-114);
margin-bottom: var(--scl-spacing-24);
height: var(--telekom-spacing-unit-x6);
font-size: var(--telekom-typography-font-size-headline-3);
font-weight: var(--telekom-typography-font-weight-extra-bold);
line-height: var(--telekom-typography-line-spacing-tight);
margin-bottom: var(--telekom-spacing-unit-x6);
}

.chart-stack-card .bar {
display: flex;
justify-content: space-between;
margin-bottom: var(--scl-spacing-16);
margin-bottom: var(--telekom-spacing-unit-x4);
}

.chart-stack-card .bar__item {
background-color: var(--scl-chart-stack-card-color);
height: var(--scl-spacing-32);
height: var(--telekom-spacing-unit-x8);
flex: 1;
}

.chart-stack-card .bar__item:first-of-type {
border-top-left-radius: var(--scl-radius-4);
border-bottom-left-radius: var(--scl-radius-4);
border-top-left-radius: var(--telekom-radius-small);
border-bottom-left-radius: var(--telekom-radius-small);
}

.chart-stack-card .bar__item:last-of-type {
border-top-right-radius: var(--scl-radius-4);
border-bottom-right-radius: var(--scl-radius-4);
border-top-right-radius: var(--telekom-radius-small);
border-bottom-right-radius: var(--telekom-radius-small);
}

.chart-stack-card .legend {
display: flex;
flex-direction: column;
height: calc(var(--scl-spacing-16) * 10);
height: calc(var(--telekom-spacing-unit-x4) * 10);
}
.chart-stack-card .spacer {
padding: 0 var(--scl-spacing-8);
padding: 0 var(--telekom-spacing-unit-x2);
}
.chart-stack-card .legend .legend__row__item {
display: flex;
line-height: var(--scl-font-line-height-133);
line-height: var(--telekom-typography-line-spacing-standard);
}
.chart-stack-card .legend .legend__row {
display: flex;
justify-content: space-between;
}
.chart-stack-card .legend .legend__row:last-child {
padding-bottom: var(--scl-spacing-32);
padding-bottom: var(--telekom-spacing-unit-x8);
}

.chart-stack-card .legend .legend__item {
Expand All @@ -72,11 +72,11 @@
background-color: var(--scl-chart-stack-card-color);
border-radius: 100%;
align-self: center;
margin-right: var(--scl-spacing-4);
margin-right: var(--telekom-spacing-unit-x1);
}

.chart-stack-card .legend .legend__label {
font-weight: var(--type-weight-bold);
font-size: var(--scl-spacing-16);
font-size: var(--telekom-spacing-unit-x4);
line-height: 200%;
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
:host,
.checkbox-group {
/* checkbox-group container */
--spacing-left-container: var(--scl-spacing-24);
--spacing-left-container: var(--telekom-spacing-unit-x6);

/* checkbox-group checkbox */
--spacing-left-checkbox: var(--scl-spacing-8);
--spacing-left-checkbox: var(--telekom-spacing-unit-x2);

/* slotted item */
--spacing-top-slotted-item: var(--scl-spacing-4);
--spacing-top-slotted-item: var(--telekom-spacing-unit-x1);
}

.checkbox-group {
Expand Down
Loading