From b3e52effacd35715bcc73a41fa14e892a6305be1 Mon Sep 17 00:00:00 2001 From: secretspecter Date: Sun, 24 Sep 2023 19:29:48 -0600 Subject: [PATCH] pull in new SCSS variables... remove the blurple --- app/javascript/styles/etr/variables.scss | 37 +++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/etr/variables.scss b/app/javascript/styles/etr/variables.scss index 7cbca8d25..e670c623a 100644 --- a/app/javascript/styles/etr/variables.scss +++ b/app/javascript/styles/etr/variables.scss @@ -1,6 +1,11 @@ // Commonly used web colors $black: #242424; // Black $white: #ddc5ac; // White +$red-600: #b7253d !default; // Deep Carmine +$red-500: #df405a !default; // Cerise +$grey-600: #4e4c5a; // Trout +$grey-100: #dadaf3; // Topaz + $success-green: #62b651 !default; $error-red: #a32a3e !default; $warning-red: #a73030 !default; @@ -14,7 +19,6 @@ $classic-primary-color: #67975a; $classic-secondary-color: #6db45d; $classic-highlight-color: #664521; - // Variables for defaults in UI $base-shadow-color: $black !default; $base-overlay-background: $black !default; @@ -29,6 +33,27 @@ $ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkes $ui-primary-color: $classic-primary-color !default; // Lighter $ui-secondary-color: $classic-secondary-color !default; // Lightest $ui-highlight-color: $classic-highlight-color !default; +$ui-button-color: $white !default; +$ui-button-background-color: $ui-highlight-color !default; +$ui-button-focus-background-color: $ui-highlight-color !default; +$ui-button-focus-outline-color: $ui-highlight-color !default; +$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default; + +$ui-button-secondary-color: $grey-100 !default; +$ui-button-secondary-border-color: $grey-100 !default; +$ui-button-secondary-focus-background-color: $grey-600 !default; +$ui-button-secondary-focus-color: $white !default; + +$ui-button-tertiary-color: $$ui-highlight-color !default; +$ui-button-tertiary-border-color: $ui-highlight-color !default; +$ui-button-tertiary-focus-background-color: $ui-highlight-color !default; +$ui-button-tertiary-focus-color: $white !default; + +$ui-button-destructive-background-color: $red-500 !default; +$ui-button-destructive-focus-background-color: $red-600 !default; + +$ui-button-icon-focus-outline: $ui-button-focus-outline !default; +$ui-button-icon-hover-background-color: rgba(140, 141, 255, 40%) !default; // Variables for texts $primary-text-color: #FFFFFF !default; @@ -37,6 +62,7 @@ $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; $highlight-text-color: lighten($ui-highlight-color, 8%) !default; $action-button-color: $ui-base-lighter-color !default; +$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default; @@ -59,3 +85,12 @@ $no-gap-breakpoint: 1175px; $font-sans-serif: 'mastodon-font-sans-serif' !default; $font-display: 'mastodon-font-display' !default; $font-monospace: 'mastodon-font-monospace' !default; + +:root { + --dropdown-border-color: #{lighten($ui-base-color, 12%)}; + --dropdown-background-color: #{lighten($ui-base-color, 4%)}; + --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, + 0 8px 10px -6px #{rgba($base-shadow-color, 0.25)}; + --modal-background-color: #{darken($ui-base-color, 4%)}; + --modal-border-color: #{lighten($ui-base-color, 4%)}; +}