diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss index 172cba2a2..121274cf8 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss @@ -3,10 +3,6 @@ @use '_mixins' as *; @use 'bootstrap/scss/functions' as *; -tr.banned > td { - background-color: color.adjust($color: $red, $lightness: 40%) !important; -} - .banned-info { font-style: italic; } diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss index 19fe075e3..81571c2ec 100644 --- a/client/src/app/+admin/system/logs/logs.component.scss +++ b/client/src/app/+admin/system/logs/logs.component.scss @@ -37,7 +37,7 @@ } .error { - color: $red; + color: pvar(--red); } pre { diff --git a/client/src/app/+videos/+video-edit/shared/caption/video-caption-add-modal.component.scss b/client/src/app/+videos/+video-edit/shared/caption/video-caption-add-modal.component.scss index 626d06f8c..0a1d03606 100644 --- a/client/src/app/+videos/+video-edit/shared/caption/video-caption-add-modal.component.scss +++ b/client/src/app/+videos/+video-edit/shared/caption/video-caption-add-modal.component.scss @@ -11,6 +11,6 @@ } .warning-replace-caption { - color: $red; + color: pvar(--red); margin-top: 10px; } diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index aa72a72b1..c5d0c157c 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html @@ -184,17 +184,16 @@ @if (videoCaption.action) { {{ getCaptionLabel(videoCaption) }} -
- @switch (videoCaption.action) { - @case ('CREATE') { - Will be created on update - } @case ('UPDATE') { - Will be edited on update - } @case ('REMOVE') { - Will be deleted on update - } + @switch (videoCaption.action) { + @case ('CREATE') { +
Will be created on update
+ } @case ('UPDATE') { +
Will be edited on update
+ Will be edited on update + } @case ('REMOVE') { +
Will be deleted on update
} -
+ } @if (videoCaption.action === 'CREATE' || videoCaption.action === 'UPDATE') { @@ -203,7 +202,7 @@ @switch (videoCaption.action) { @case ('CREATE') { - Cancel create + Cancel creation } @case ('UPDATE') { Cancel edition } @case ('REMOVE') { diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss index 9afdc5bb3..a8ece799f 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss @@ -56,14 +56,6 @@ my-timestamp-input { min-width: 250px; @include margin-right(15px); - - &.caption-entry-state-create { - color: $green; - } - - &.caption-entry-state-delete { - color: $red; - } } } diff --git a/client/src/app/shared/shared-instance/feature-boolean.component.scss b/client/src/app/shared/shared-instance/feature-boolean.component.scss index 29b8c3e02..7ca9635e0 100644 --- a/client/src/app/shared/shared-instance/feature-boolean.component.scss +++ b/client/src/app/shared/shared-instance/feature-boolean.component.scss @@ -2,9 +2,9 @@ @use '_mixins' as *; my-global-icon[iconName=tick] { - color: $green; + color: pvar(--green); } my-global-icon[iconName=cross] { - color: $red; + color: pvar(--red); } diff --git a/client/src/app/shared/standalone-upload/upload-progress.component.scss b/client/src/app/shared/standalone-upload/upload-progress.component.scss index 99fd1e026..2e420b282 100644 --- a/client/src/app/shared/standalone-upload/upload-progress.component.scss +++ b/client/src/app/shared/standalone-upload/upload-progress.component.scss @@ -12,7 +12,7 @@ @include progressbar($height: 30px, $font-size: 14px, $background-color: rgba(11, 204, 41, 0.16)); .progress-bar { - background-color: $green; + background-color: pvar(--green); line-height: 30px; text-align: start; font-weight: $font-semibold; diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index dba1eb8bb..9a99fca89 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -22,6 +22,9 @@ body { /*** theme ***/ // now beware sass requires interpolation // for css custom properties #{$var} + --red: #{$red}; + --green: #{$green}; + --mainColor: #{$main-color}; --mainColorLighter: #{$main-color-lighter}; --mainColorLightest: #{$main-color-lightest}; diff --git a/client/src/sass/class-helpers/_forms.scss b/client/src/sass/class-helpers/_forms.scss index 3bfd5b727..4f76a101a 100644 --- a/client/src/sass/class-helpers/_forms.scss +++ b/client/src/sass/class-helpers/_forms.scss @@ -11,7 +11,7 @@ +.nav-preview, // Markdown textarea +*+.tab-content { - border-color: $red !important; + border-color: pvar(--red) !important; } } @@ -27,7 +27,7 @@ } .form-error { - color: $red; + color: pvar(--red); } // Disable red error on input focus diff --git a/client/src/sass/class-helpers/_text.scss b/client/src/sass/class-helpers/_text.scss index 1aa913447..636869c54 100644 --- a/client/src/sass/class-helpers/_text.scss +++ b/client/src/sass/class-helpers/_text.scss @@ -4,6 +4,14 @@ @use '_variables' as *; @use '_mixins' as *; +.red { + color: pvar(--red); +} + +.green { + color: pvar(--green); +} + .link-orange { color: pvar(--mainForegroundColor); font-weight: $font-semibold; diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 1394f7898..d7ac9594f 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -31,8 +31,8 @@ $support-button-heart: #e83e8c; $bg-color: #fff; $fg-color: #212529; -$red: #FF0000; -$green: #38AB0B; +$red: #EE0700; +$green: #338809; $expanded-horizontal-margins: 150px; $not-expanded-horizontal-margins: 30px; @@ -106,6 +106,9 @@ $primeng-breakpoint: 960px; // pass variables into a sass map, // to be warned of non-existing variables $variables: ( + --red: var(--red), + --green: var(--green), + --mainColor: var(--mainColor), --mainColorLighter: var(--mainColorLighter), --mainColorLightest: var(--mainColorLightest),