From 2b78a656225a00dbf23f5e33e53461c4f85147ec Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 12 May 2021 08:55:43 -0400 Subject: [PATCH] DEV: Remove SCSS color vars fallbacks (#133) --- .../common/discourse-calendar.scss | 40 +++++++++---------- .../common/discourse-post-event-builder.scss | 2 +- .../common/discourse-post-event-core-ext.scss | 6 +-- .../common/discourse-post-event-invitees.scss | 6 +-- .../common/discourse-post-event-preview.scss | 4 +- .../common/discourse-post-event.scss | 32 +++++++-------- .../common/upcoming-events-calendar.scss | 30 +++++++------- .../desktop/discourse-calendar.scss | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/assets/stylesheets/common/discourse-calendar.scss b/assets/stylesheets/common/discourse-calendar.scss index 5719699d..cb6237f6 100644 --- a/assets/stylesheets/common/discourse-calendar.scss +++ b/assets/stylesheets/common/discourse-calendar.scss @@ -1,6 +1,6 @@ .discourse-calendar-wrap { margin: 0.5em 0; - border: 5px solid var(--primary-low, $primary-low); + border: 5px solid var(--primary-low); } .category-calendar .calendar { @@ -44,7 +44,7 @@ } .fc-bg td.fc-today { - background-color: var(--highlight-medium, $highlight-medium); + background-color: var(--highlight-medium); border-style: solid; } @@ -82,21 +82,21 @@ .fc-button { border-radius: 0; box-shadow: none; - background: var(--primary-low, $primary-low); + background: var(--primary-low); text-transform: capitalize; - color: var(--primary, $primary); + color: var(--primary); text-shadow: none; border: none; padding: 6px 12px; &:hover { - background: var(--primary-medium, $primary-medium); - color: var(--secondary, $secondary); + background: var(--primary-medium); + color: var(--secondary); } &.fc-state-active { - background: var(--tertiary, $tertiary); - color: var(--secondary, $secondary); + background: var(--tertiary); + color: var(--secondary); } } @@ -111,7 +111,7 @@ .fc-list-empty, .fc-list-heading td, .fc-popover .fc-header { - background: var(--primary-low, $primary-low); + background: var(--primary-low); } .fc-content, @@ -124,13 +124,13 @@ td, th, thead { - border-color: var(--primary-low, $primary-low); + border-color: var(--primary-low); } } .fc-event, .fc-event-dot { - background-color: var(--tertiary, $tertiary); + background-color: var(--tertiary); border: 1px solid transparent; .fc-time { @@ -138,9 +138,9 @@ } &.grouped-event { - background-color: var(--primary-low, $primary-low); - border: 1px solid var(--primary-low-mid, $primary-low-mid); - color: var(--primary, $primary); + background-color: var(--primary-low); + border: 1px solid var(--primary-low-mid); + color: var(--primary); .emoji { margin-right: 0.25em; @@ -154,7 +154,7 @@ } } .fc-list-item-add-to-calendar { - color: var(--tertiary, $tertiary); + color: var(--tertiary); font-size: $font-down-1; } } @@ -179,8 +179,8 @@ a.holiday { justify-content: space-between; box-sizing: border-box; padding: 0.5em; - border-bottom: 1px solid var(--primary-low, $primary-low); - background: var(--primary-very-low, $primary-very-low); + border-bottom: 1px solid var(--primary-low); + background: var(--primary-very-low); min-height: 60px; .discourse-calendar-timezone-picker { @@ -329,8 +329,8 @@ $bg-in-working-hours: dark-light-choose( } .group-timezone { - color: var(--primary, $primary); - background-color: var(--calendar-normal, $bg-normal); + color: var(--primary); + background-color: var(--calendar-normal); transition: opacity 0.4s; opacity: 0.5; @@ -351,7 +351,7 @@ $bg-in-working-hours: dark-light-choose( } &.in-working-hours { - background-color: var(--calendar-in-working-hours, $bg-in-working-hours); + background-color: var(--calendar-in-working-hours); opacity: 1; } diff --git a/assets/stylesheets/common/discourse-post-event-builder.scss b/assets/stylesheets/common/discourse-post-event-builder.scss index 040cb117..d6dcf304 100644 --- a/assets/stylesheets/common/discourse-post-event-builder.scss +++ b/assets/stylesheets/common/discourse-post-event-builder.scss @@ -169,7 +169,7 @@ flex-direction: column; .description { - color: var(--primary-medium, $primary-medium); + color: var(--primary-medium); } } } diff --git a/assets/stylesheets/common/discourse-post-event-core-ext.scss b/assets/stylesheets/common/discourse-post-event-core-ext.scss index 17e7144d..18feaf7a 100644 --- a/assets/stylesheets/common/discourse-post-event-core-ext.scss +++ b/assets/stylesheets/common/discourse-post-event-core-ext.scss @@ -9,7 +9,7 @@ display: inline-flex; align-items: center; font-size: $font-down-2; - border: 1px solid var(--primary-medium, $primary-medium); + border: 1px solid var(--primary-medium); background: none; padding: 0 0.25em; border-radius: 3px; @@ -21,7 +21,7 @@ width: 6px; height: 6px; border-radius: 3px; - background: var(--success, $success); + background: var(--success); margin-right: 0.25em; } } @@ -30,7 +30,7 @@ .header-title { .event-date { font-size: $font-down-4; - color: var(--primary-medium, $primary-medium); + color: var(--primary-medium); font-weight: normal; padding: 0.25em; } diff --git a/assets/stylesheets/common/discourse-post-event-invitees.scss b/assets/stylesheets/common/discourse-post-event-invitees.scss index 22ee302b..98af1249 100644 --- a/assets/stylesheets/common/discourse-post-event-invitees.scss +++ b/assets/stylesheets/common/discourse-post-event-invitees.scss @@ -15,7 +15,7 @@ padding: 0.5em; justify-content: space-between; align-items: center; - border-bottom: 1px solid var(--primary-low, $primary-low); + border-bottom: 1px solid var(--primary-low); &:last-child { border: none; @@ -32,11 +32,11 @@ margin-right: 0.5em; &.going { - color: var(--success, $success); + color: var(--success); } &.not_going { - color: var(--danger, $danger); + color: var(--danger); } } } diff --git a/assets/stylesheets/common/discourse-post-event-preview.scss b/assets/stylesheets/common/discourse-post-event-preview.scss index 6a5e3c92..67c9c096 100644 --- a/assets/stylesheets/common/discourse-post-event-preview.scss +++ b/assets/stylesheets/common/discourse-post-event-preview.scss @@ -1,9 +1,9 @@ .discourse-post-event-preview { - background: var(--secondary, $secondary); + background: var(--secondary); align-items: center; flex-direction: column; padding: 0.5em; - border: 1px solid var(--primary-low, $primary-low); + border: 1px solid var(--primary-low); display: flex; flex: 1 0 auto; diff --git a/assets/stylesheets/common/discourse-post-event.scss b/assets/stylesheets/common/discourse-post-event.scss index 3055e032..faa1aa29 100644 --- a/assets/stylesheets/common/discourse-post-event.scss +++ b/assets/stylesheets/common/discourse-post-event.scss @@ -2,9 +2,9 @@ display: flex; .discourse-post-event-widget { - border: 5px solid var(--primary-low, $primary-low); + border: 5px solid var(--primary-low); display: flex; - background: var(--secondary, $secondary); + background: var(--secondary); margin: 5px 0; flex-direction: column; flex: 1 0 auto; @@ -106,7 +106,7 @@ .status-and-creators { display: flex; align-items: center; - color: var(--primary-medium, $primary-medium); + color: var(--primary-medium); font-size: $font-down-1; margin: 0.25em 0; @@ -130,7 +130,7 @@ .status { &.expired { - color: var(--danger-medium, $danger-medium); + color: var(--danger-medium); } .d-icon { @@ -151,13 +151,13 @@ margin: 0; &.status-going .going-button .d-icon { - color: var(--success, $success); + color: var(--success); } &.status-interested .interested-button .d-icon { color: adjust-hue($danger, 25%); } &.status-not_going .not-going-button .d-icon { - color: var(--danger, $danger); + color: var(--danger); } } } @@ -193,7 +193,7 @@ .invited { font-weight: 500; - color: var(--primary-medium, $primary-medium); + color: var(--primary-medium); } } } @@ -218,11 +218,11 @@ } &.status-going .avatar-flair { - color: var(--success, $success); + color: var(--success); } &.status-not_going .avatar-flair { - color: var(--danger, $danger); + color: var(--danger); } &.status-interested .avatar-flair { @@ -238,15 +238,15 @@ position: absolute; right: 0; bottom: 0; - background: var(--secondary, $secondary); + background: var(--secondary); border-radius: 50%; height: 16px; width: 16px; display: flex; align-items: center; justify-content: center; - color: var(--primary-medium, $primary-medium); - border: 1px solid var(--primary-low, $primary-low); + color: var(--primary-medium); + border: 1px solid var(--primary-low); .d-icon { font-size: $font-down-3; @@ -269,7 +269,7 @@ flex: 1; .d-icon { - color: var(--primary-high, $primary-high); + color: var(--primary-high); } } @@ -284,11 +284,11 @@ .event-dates { .participants { margin-left: 0.5em; - color: var(--primary-medium, $primary-medium); + color: var(--primary-medium); } .date { - color: var(--primary-high, $primary-high); + color: var(--primary-high); margin-left: 1em; .discourse-local-date { @@ -299,7 +299,7 @@ } .separator { - color: var(--primary-high, $primary-high); + color: var(--primary-high); margin: 0 0.5em; text-align: center; } diff --git a/assets/stylesheets/common/upcoming-events-calendar.scss b/assets/stylesheets/common/upcoming-events-calendar.scss index 9f3fbdaf..aa688693 100644 --- a/assets/stylesheets/common/upcoming-events-calendar.scss +++ b/assets/stylesheets/common/upcoming-events-calendar.scss @@ -11,7 +11,7 @@ } .fc-bg td.fc-today { - background-color: var(--highlight-medium, $highlight-medium); + background-color: var(--highlight-medium); border-style: solid; } @@ -49,22 +49,22 @@ .fc-button { border-radius: 0; box-shadow: none; - background: var(--primary-low, $primary-low); + background: var(--primary-low); text-transform: capitalize; - color: var(--primary, $primary); + color: var(--primary); text-shadow: none; border: none; padding: 6px 12px; &:hover { - background: var(--primary-medium, $primary-medium); - color: var(--secondary, $secondary); + background: var(--primary-medium); + color: var(--secondary); } &.fc-state-active { - background: var(--tertiary, $tertiary); - color: var(--secondary, $secondary); + background: var(--tertiary); + color: var(--secondary); } margin: 0.3em 0 0.3em 0.5em; } @@ -81,7 +81,7 @@ .fc-list-empty, .fc-list-heading td, .fc-popover .fc-header { - background: var(--primary-low, $primary-low); + background: var(--primary-low); } .fc-content, @@ -94,14 +94,14 @@ td, th, thead { - border-color: var(--primary-low, $primary-low); + border-color: var(--primary-low); } } .fc-event, .fc-event-dot { - color: var(--secondary, $secondary); - background-color: var(--tertiary, $tertiary); + color: var(--secondary); + background-color: var(--tertiary); border: 1px solid transparent; .fc-time { @@ -110,9 +110,9 @@ &.grouped-event { background-color: none; - background: var(--secondary, $secondary); - border: 1px solid var(--primary-low-mid, $primary-low-mid); - color: var(--primary, $primary); + background: var(--secondary); + border: 1px solid var(--primary-low-mid); + color: var(--primary); .emoji { margin-right: 0.25em; @@ -126,7 +126,7 @@ } } .fc-list-item-add-to-calendar { - color: var(--tertiary, $tertiary); + color: var(--tertiary); font-size: $font-down-1; } } diff --git a/assets/stylesheets/desktop/discourse-calendar.scss b/assets/stylesheets/desktop/discourse-calendar.scss index 430f3933..3db87392 100644 --- a/assets/stylesheets/desktop/discourse-calendar.scss +++ b/assets/stylesheets/desktop/discourse-calendar.scss @@ -4,6 +4,6 @@ margin-right: 5px; } .fc-list-item:hover td { - background: var(--highlight-medium, $highlight-medium); + background: var(--highlight-medium); } }