Skip to content

Commit

Permalink
feat(vars): updated colors and typography from latest alfa-ui-primiti…
Browse files Browse the repository at this point in the history
…ves (#803)

* feat(vars): updated colors and typography from latest alfa-ui-primitives

* updated screenshots
  • Loading branch information
SiebenSieben committed Sep 10, 2021
1 parent 85fe550 commit 0d5b2a3
Show file tree
Hide file tree
Showing 12 changed files with 89 additions and 42 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@alfalab/stylelint-core-vars": "^1.1.0",
"@alfalab/utils": "^1.3.0",
"@popperjs/core": "^2.3.3",
"alfa-ui-primitives": "^2.213.0",
"alfa-ui-primitives": "^2.234.0",
"classnames": "^2.2.6",
"compute-scroll-into-view": "^1.0.13",
"date-fns": "^2.16.1",
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/themes/src/mixins/colors/colors-indigo.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
--color-light-border-secondary-inverted: var(--color-dark-border-secondary-inverted);
--color-light-border-tertiary: var(--color-dark-border-tertiary);
--color-light-border-tertiary-inverted: var(--color-dark-border-tertiary-inverted);
--color-light-border-underline: var(--color-dark-border-underline);
--color-light-border-underline-inverted: var(--color-dark-border-underline-inverted);
--color-light-graphic-accent: var(--color-dark-graphic-accent);
--color-light-graphic-attention: var(--color-dark-graphic-attention);
--color-light-graphic-link: var(--color-dark-graphic-link);
Expand All @@ -34,6 +36,7 @@
--color-light-graphic-secondary-inverted: var(--color-dark-graphic-secondary-inverted);
--color-light-graphic-tertiary: var(--color-dark-graphic-tertiary);
--color-light-specialbg-component: var(--color-dark-specialbg-component);
--color-light-specialbg-component-inverted: var(--color-dark-specialbg-component-inverted);
--color-light-specialbg-nulled: var(--color-dark-specialbg-nulled);
--color-light-specialbg-primary-grouped: var(--color-dark-specialbg-primary-grouped);
--color-light-specialbg-secondary-grouped: var(--color-dark-specialbg-secondary-grouped);
Expand Down
54 changes: 27 additions & 27 deletions packages/vars/src/colors-bluetint.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--color-dark-bg-accent: #e81f11;
--color-dark-bg-accent: #ef3124;
--color-dark-bg-attention-muted: #332104;
--color-dark-bg-info: #001c3c;
--color-dark-bg-negative-muted: #35110d;
Expand All @@ -13,15 +13,15 @@
--color-dark-bg-secondary-inverted: #f3f4f5;
--color-dark-bg-tertiary: #2c2c2e;
--color-dark-bg-tertiary-inverted: #e9e9eb;
--color-dark-border-accent: #e81f11;
--color-dark-border-accent: #ef3124;
--color-dark-border-key: #fff;
--color-dark-border-key-inverted: #121212;
--color-dark-border-primary: #2b2b2e;
--color-dark-border-secondary: #262629;
--color-dark-border-secondary-inverted: #e9e9eb;
--color-dark-border-tertiary: #1c1c1e;
--color-dark-border-tertiary-inverted: #f3f4f5;
--color-dark-graphic-accent: #e81f11;
--color-dark-graphic-accent: #ef3124;
--color-dark-graphic-attention: #f6bf65;
--color-dark-graphic-link: #0072ef;
--color-dark-graphic-negative: #d91d0b;
Expand All @@ -35,7 +35,7 @@
--color-dark-specialbg-primary-grouped: #202022;
--color-dark-specialbg-secondary-grouped: #2c2c2e;
--color-dark-specialbg-tertiary-grouped: #3a3a3c;
--color-dark-text-accent: #e81f11;
--color-dark-text-accent: #ef3124;
--color-dark-text-attention: #cb830f;
--color-dark-text-disabled: #2a2a2c;
--color-dark-text-disabled-transparent: rgba(235, 235, 245, 0.18);
Expand All @@ -52,7 +52,7 @@
--color-dark-text-tertiary-inverted: #c5c5c7;
--color-dark-text-tertiary-inverted-transparent: rgba(60, 60, 67, 0.3);
--color-dark-text-tertiary-transparent: rgba(235, 235, 245, 0.3);
--color-light-bg-accent: #e81f11;
--color-light-bg-accent: #ef3124;
--color-light-bg-attention-muted: #f7ebd9;
--color-light-bg-info: #d6e8fc;
--color-light-bg-negative-muted: #fbe8e7;
Expand All @@ -66,15 +66,15 @@
--color-light-bg-secondary-inverted: #202022;
--color-light-bg-tertiary: #e9e9eb;
--color-light-bg-tertiary-inverted: #2c2c2e;
--color-light-border-accent: #e81f11;
--color-light-border-accent: #ef3124;
--color-light-border-key: #000;
--color-light-border-key-inverted: #fff;
--color-light-border-primary: #dcdcdd;
--color-light-border-secondary: #e9e9eb;
--color-light-border-secondary-inverted: #262629;
--color-light-border-tertiary: #f3f4f5;
--color-light-border-tertiary-inverted: #1c1c1e;
--color-light-graphic-accent: #e81f11;
--color-light-graphic-accent: #ef3124;
--color-light-graphic-attention: #f6bf65;
--color-light-graphic-link: #0072ef;
--color-light-graphic-negative: #f15045;
Expand All @@ -88,7 +88,7 @@
--color-light-specialbg-primary-grouped: #f3f4f5;
--color-light-specialbg-secondary-grouped: #fff;
--color-light-specialbg-tertiary-grouped: #f3f4f5;
--color-light-text-accent: #e81f11;
--color-light-text-accent: #ef3124;
--color-light-text-attention: #cb830f;
--color-light-text-disabled: #dcdcdd;
--color-light-text-disabled-transparent: rgba(60, 60, 67, 0.18);
Expand All @@ -105,18 +105,18 @@
--color-light-text-tertiary-inverted: #464649;
--color-light-text-tertiary-inverted-transparent: rgba(235, 235, 245, 0.3);
--color-light-text-tertiary-transparent: rgba(60, 60, 67, 0.3);
--color-static-bg-accent: #e81f11;
--color-static-bg-accent: #ef3124;
--color-static-bg-neutral-dark: #3a3a3c;
--color-static-bg-neutral-light: #dcdcdd;
--color-static-bg-primary-dark: #121212;
--color-static-bg-primary-light: #fff;
--color-static-bg-secondary-dark: #202022;
--color-static-bg-secondary-light: #f3f4f5;
--color-static-border-accent: #e81f11;
--color-static-border-accent: #ef3124;
--color-static-graphic-accent: #ef3124;
--color-static-graphic-dark: #000;
--color-static-graphic-light: #fff;
--color-static-text-accent: #e81f11;
--color-static-text-accent: #ef3124;
--color-static-text-primary-dark: #000;
--color-static-text-primary-light: #fff;
--color-static-text-secondary-dark: #8a8a8e;
Expand All @@ -127,11 +127,11 @@
--color-static-text-tertiary-dark-transparent: rgba(60, 60, 67, 0.3);
--color-static-text-tertiary-light: #464649;
--color-static-text-tertiary-light-transparent: rgba(235, 235, 245, 0.3);
--color-dark-bg-accent-alpha-30: color-mod(#e81f11 alpha(30%));
--color-dark-bg-accent-tint-7: color-mod(#e81f11 tint(7%));
--color-dark-bg-accent-tint-10: color-mod(#e81f11 tint(10%));
--color-dark-bg-accent-tint-15: color-mod(#e81f11 tint(15%));
--color-dark-bg-accent-tint-30: color-mod(#e81f11 tint(30%));
--color-dark-bg-accent-alpha-30: color-mod(#ef3124 alpha(30%));
--color-dark-bg-accent-tint-7: color-mod(#ef3124 tint(7%));
--color-dark-bg-accent-tint-10: color-mod(#ef3124 tint(10%));
--color-dark-bg-accent-tint-15: color-mod(#ef3124 tint(15%));
--color-dark-bg-accent-tint-30: color-mod(#ef3124 tint(30%));
--color-dark-bg-neutral-alpha-30: color-mod(#3a3a3c alpha(30%));
--color-dark-bg-neutral-tint-7: color-mod(#3a3a3c tint(7%));
--color-dark-bg-neutral-tint-10: color-mod(#3a3a3c tint(10%));
Expand All @@ -147,9 +147,9 @@
--color-dark-bg-secondary-inverted-alpha-15: color-mod(#f3f4f5 alpha(15%));
--color-dark-bg-tertiary-tint-7: color-mod(#2c2c2e tint(7%));
--color-dark-border-tertiary-inverted-alpha-30: color-mod(#f3f4f5 alpha(30%));
--color-dark-graphic-accent-alpha-30: color-mod(#e81f11 alpha(30%));
--color-dark-graphic-accent-tint-10: color-mod(#e81f11 tint(10%));
--color-dark-graphic-accent-tint-30: color-mod(#e81f11 tint(30%));
--color-dark-graphic-accent-alpha-30: color-mod(#ef3124 alpha(30%));
--color-dark-graphic-accent-tint-10: color-mod(#ef3124 tint(10%));
--color-dark-graphic-accent-tint-30: color-mod(#ef3124 tint(30%));
--color-dark-graphic-negative-shade-30: color-mod(#d91d0b shade(30%));
--color-dark-graphic-negative-shade-50: color-mod(#d91d0b shade(50%));
--color-dark-graphic-neutral-tint-10: color-mod(#2a2a2c tint(10%));
Expand Down Expand Up @@ -178,11 +178,11 @@
--color-dark-text-secondary-shade-50: color-mod(#8d8d93 shade(50%));
--color-dark-text-secondary-tint-20: color-mod(#8d8d93 tint(20%));
--color-dark-text-secondary-tint-40: color-mod(#8d8d93 tint(40%));
--color-light-bg-accent-alpha-30: color-mod(#e81f11 alpha(30%));
--color-light-bg-accent-shade-7: color-mod(#e81f11 shade(7%));
--color-light-bg-accent-shade-10: color-mod(#e81f11 shade(10%));
--color-light-bg-accent-shade-15: color-mod(#e81f11 shade(15%));
--color-light-bg-accent-shade-30: color-mod(#e81f11 shade(30%));
--color-light-bg-accent-alpha-30: color-mod(#ef3124 alpha(30%));
--color-light-bg-accent-shade-7: color-mod(#ef3124 shade(7%));
--color-light-bg-accent-shade-10: color-mod(#ef3124 shade(10%));
--color-light-bg-accent-shade-15: color-mod(#ef3124 shade(15%));
--color-light-bg-accent-shade-30: color-mod(#ef3124 shade(30%));
--color-light-bg-neutral-alpha-30: color-mod(#dcdcdd alpha(30%));
--color-light-bg-neutral-shade-7: color-mod(#dcdcdd shade(7%));
--color-light-bg-neutral-shade-10: color-mod(#dcdcdd shade(10%));
Expand All @@ -198,9 +198,9 @@
--color-light-bg-secondary-inverted-alpha-15: color-mod(#202022 alpha(15%));
--color-light-bg-tertiary-shade-7: color-mod(#e9e9eb shade(7%));
--color-light-border-tertiary-inverted-alpha-30: color-mod(#1c1c1e alpha(30%));
--color-light-graphic-accent-alpha-30: color-mod(#e81f11 alpha(30%));
--color-light-graphic-accent-shade-10: color-mod(#e81f11 shade(10%));
--color-light-graphic-accent-shade-30: color-mod(#e81f11 shade(30%));
--color-light-graphic-accent-alpha-30: color-mod(#ef3124 alpha(30%));
--color-light-graphic-accent-shade-10: color-mod(#ef3124 shade(10%));
--color-light-graphic-accent-shade-30: color-mod(#ef3124 shade(30%));
--color-light-graphic-negative-tint-30: color-mod(#f15045 tint(30%));
--color-light-graphic-negative-tint-50: color-mod(#f15045 tint(50%));
--color-light-graphic-neutral-shade-10: color-mod(#dcdcdd shade(10%));
Expand Down
5 changes: 5 additions & 0 deletions packages/vars/src/colors-indigo.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
--color-dark-border-secondary-inverted: #6d7986;
--color-dark-border-tertiary: #233549;
--color-dark-border-tertiary-inverted: #b6bcc3;
--color-dark-border-underline: #6d7986;
--color-dark-border-underline-inverted: #b6bcc3;
--color-dark-graphic-accent: #ef3124;
--color-dark-graphic-attention: #e58933;
--color-dark-graphic-link: #007aff;
Expand All @@ -34,6 +36,7 @@
--color-dark-graphic-secondary-inverted: #233549;
--color-dark-graphic-tertiary: #6d7986;
--color-dark-specialbg-component: #485767;
--color-dark-specialbg-component-inverted: rgba(11, 31, 53, 0.07);
--color-dark-specialbg-nulled: rgba(11, 31, 53, 0);
--color-dark-specialbg-primary-grouped: #0b1f35;
--color-dark-specialbg-secondary-grouped: #233549;
Expand Down Expand Up @@ -78,6 +81,8 @@
--color-light-border-secondary-inverted: #b6bcc3;
--color-light-border-tertiary: #f3f4f5;
--color-light-border-tertiary-inverted: #6d7986;
--color-light-border-underline: #b6bcc3;
--color-light-border-underline-inverted: #6d7986;
--color-light-graphic-accent: #ef3124;
--color-light-graphic-attention: #e58933;
--color-light-graphic-link: #007aff;
Expand Down
36 changes: 36 additions & 0 deletions packages/vars/src/typography.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,18 @@
font-weight: 400;
}

@define-mixin paragraph_component_primary {
font-size: 16px;
line-height: 20px;
font-weight: 400;
}

@define-mixin paragraph_component_secondary {
font-size: 14px;
line-height: 18px;
font-weight: 400;
}

@define-mixin paragraph_caps {
font-size: 12px;
line-height: 16px;
Expand Down Expand Up @@ -137,6 +149,18 @@
font-weight: 700;
}

@define-mixin accent_component_primary {
font-size: 16px;
line-height: 20px;
font-weight: 700;
}

@define-mixin accent_component_secondary {
font-size: 14px;
line-height: 18px;
font-weight: 700;
}

@define-mixin accent_caps {
font-size: 12px;
line-height: 16px;
Expand Down Expand Up @@ -217,6 +241,18 @@
font-weight: 500;
}

@define-mixin action_component_primary {
font-size: 16px;
line-height: 20px;
font-weight: 500;
}

@define-mixin action_component_secondary {
font-size: 14px;
line-height: 18px;
font-weight: 500;
}

@define-mixin action_caps {
font-size: 12px;
line-height: 16px;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6163,10 +6163,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"

alfa-ui-primitives@^2.213.0:
version "2.213.0"
resolved "https://registry.yarnpkg.com/alfa-ui-primitives/-/alfa-ui-primitives-2.213.0.tgz#eea43ffaface1f88d85a5cfe022ca4f72c667f68"
integrity sha512-uJqHv7JYGFyLo+BDIAYzeGixk3s7HgIVEr0dN8cnzHm/Um4HrPz7yNXamdfTrcrU9gkiErSiNT6kDbSEXcl0Og==
alfa-ui-primitives@^2.234.0:
version "2.234.0"
resolved "https://registry.yarnpkg.com/alfa-ui-primitives/-/alfa-ui-primitives-2.234.0.tgz#0992e7c12c9dc527c0c7819fbccabaa4b26493a6"
integrity sha512-lRC+BNt7s4KSSr2v2ZycQ78tFh3qHSr+R9l23JpcQNREf9pRHJdA+gWSX381YcC4fxb1CIvYiK+noyySR0nXWw==

alphanum-sort@^1.0.0:
version "1.0.2"
Expand Down

0 comments on commit 0d5b2a3

Please sign in to comment.