diff --git a/components/00-base/01-colors/_colors-vars.scss b/components/00-base/01-colors/_colors-vars.scss index 236f0b3a..04e896a2 100644 --- a/components/00-base/01-colors/_colors-vars.scss +++ b/components/00-base/01-colors/_colors-vars.scss @@ -11,13 +11,19 @@ $gray-light: #888; $gray: #666; $gray-dark: #4c4c4c; $gray-darker: #333; +$gray-darkest: #222; $black: black; // Status -$yellow-light: #f9fb93; -$red-light: #fbe3e4; -$green-light: #cfefc2; +$yellow: #ecef26; +$yellow-light: #f6f886; +$red: #ca242c; +$red-light: #fcd0d2; +$green: #278002; +$green-light: #a6eb89; // Project -$purple: #610c63; -$blue: #005de0; +$purple: #5c0a5d; +$purple-light: #912892; +$blue: #0852ba; +$blue-light: #61a0f7; diff --git a/components/00-base/01-colors/colors-used.scss b/components/00-base/01-colors/colors-used.scss index 22f9eda5..6ec984f7 100644 --- a/components/00-base/01-colors/colors-used.scss +++ b/components/00-base/01-colors/colors-used.scss @@ -8,7 +8,9 @@ $defaultColors: ( background: colors-vars.$white, background-section: colors-vars.$gray-lightest, primary: colors-vars.$blue, + primary-alt: colors-vars.$blue-light, secondary: colors-vars.$purple, + secondary-alt: colors-vars.$purple-light, accent: colors-vars.$gray-dark, accent-high: colors-vars.$black, highlight: colors-vars.$gray-lighter, @@ -24,17 +26,19 @@ $darkColors: ( text-inverse: colors-vars.$gray, background: colors-vars.$gray, background-inverse: colors-vars.$gray-light, - background-section: colors-vars.$gray-dark, - primary: colors-vars.$blue, - secondary: colors-vars.$purple, + background-section: colors-vars.$gray-darkest, + primary: colors-vars.$blue-light, + primary-alt: colors-vars.$blue, + secondary: colors-vars.$purple-light, + secondary-alt: colors-vars.$purple, accent: colors-vars.$gray-lightest, accent-high: colors-vars.$white, highlight: colors-vars.$gray-dark, highlight-high: colors-vars.$gray-darker, muted: colors-vars.$gray-darker, - warning: colors-vars.$yellow-light, - error: colors-vars.$red-light, - message: colors-vars.$green-light, + warning: colors-vars.$yellow, + error: colors-vars.$red, + message: colors-vars.$green, ); /////////// diff --git a/components/00-base/01-colors/colors.yml b/components/00-base/01-colors/colors.yml index a6e98adc..6cb338a8 100644 --- a/components/00-base/01-colors/colors.yml +++ b/components/00-base/01-colors/colors.yml @@ -5,7 +5,9 @@ palettes: - name: 'Text' - name: 'Background' - name: 'Primary' + - name: 'Primary Alt' - name: 'Secondary' + - name: 'Secondary Alt' - name: 'Accent' - name: 'Accent High' - name: 'Highlight' @@ -19,7 +21,9 @@ palettes: - name: 'Text' - name: 'Background' - name: 'Primary' + - name: 'Primary Alt' - name: 'Secondary' + - name: 'Secondary Alt' - name: 'Accent' - name: 'Accent High' - name: 'Highlight' diff --git a/components/01-atoms/buttons/_buttons.scss b/components/01-atoms/buttons/_buttons.scss index 5df5faa5..7fe79aae 100644 --- a/components/01-atoms/buttons/_buttons.scss +++ b/components/01-atoms/buttons/_buttons.scss @@ -9,13 +9,13 @@ $button-colors: ( ), primary-dark: ( text: clr(text), - bg: clr(primary), + bg: clr(primary-alt), text-hover: clr(text), bg-hover: clr(highlight-high), ), secondary: ( text: clr(text-inverse), - bg: clr(secondary), + bg: clr(secondary-alt), text-hover: clr(secondary), bg-hover: clr(highlight), ), diff --git a/components/01-atoms/buttons/button.twig b/components/01-atoms/buttons/button.twig index ba6c3fa2..b83f380f 100644 --- a/components/01-atoms/buttons/button.twig +++ b/components/01-atoms/buttons/button.twig @@ -11,11 +11,11 @@ {% set button_base_class = button_base_class|default('button') %} -{% set additional_attributes = { +{% set button_attributes = button_attributes|default({ class: bem(button_base_class, button_modifiers, button_blockname), -} %} +}) %} -