Merge branch 'release/2.2.0' into develop

5 files changed, 16 insertions, 7 deletions

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 17ed5c8f8..16e7ea5ca 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -31,6 +31,8 @@ body {
   --mainForegroundColor: #{$fg-color};
   --secondaryColor: #{$secondary-color};
 
+  --greyForegroundColor: #{$grey-foreground-color};
+
   --menuBackgroundColor: #{$menu-background};
   --menuForegroundColor: #{$menu-color};
   --submenuColor: #{$sub-menu-color};
@@ -48,6 +50,8 @@ body {
   --supportButtonColor: #{var(--actionButtonColor)};
   --supportButtonHeartColor: #{$support-button-heart};
 
+  --activatedActionButtonColor: #{$activated-action-button-color};
+
   font-family: $main-fonts;
   font-weight: $font-regular;
   color: var(--mainForegroundColor);
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index c937a0f72..d0ee1e2f0 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -187,7 +187,7 @@ $play-overlay-width: 18px;
       }
 
       .followers {
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         font-weight: normal;
         font-size: 14px;
         margin-left: 10px;
@@ -203,7 +203,7 @@ $play-overlay-width: 18px;
     display: inline-block;
     font-size: 16px;
     text-transform: uppercase;
-    color: $grey-foreground-color;
+    color: var(--greyForegroundColor);
     margin-bottom: 10px;
     font-weight: $font-semibold;
     text-decoration: none;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 99ca25f9c..80a090159 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -156,7 +156,7 @@
 @mixin tertiary-button {
   @include button-focus($grey-button-outline-color);
 
-  color: $grey-foreground-color;
+  color: var(--greyForegroundColor);
   background-color: transparent;
 
   &[disabled], &.disabled {
@@ -173,11 +173,11 @@
 
   &, &:active, &:focus {
     background-color: $grey-background-color;
-    color: $grey-foreground-color;
+    color: var(--greyForegroundColor);
   }
 
   &:hover, &:active, &:focus, &[disabled], &.disabled {
-    color: $grey-foreground-color;
+    color: var(--greyForegroundColor);
     background-color: $grey-background-hover-color;
   }
 
@@ -186,7 +186,7 @@
   }
 
   my-global-icon {
-    @include apply-svg-color($grey-foreground-color)
+    @include apply-svg-color(var(--greyForegroundColor))
   }
 }
 
@@ -769,7 +769,7 @@
         vertical-align: middle !important;
 
         path  {
-          fill: $grey-foreground-color !important;
+          fill: var(--greyForegroundColor) !important;
         }
       }
 
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index cdac8ae6f..11561e268 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -91,6 +91,8 @@ $variables: (
   --mainForegroundColor: var(--mainForegroundColor),
   --secondaryColor: var(--secondaryColor),
 
+  --greyForegroundColor: var(--greyForegroundColor),
+
   --menuBackgroundColor: var(--menuBackgroundColor),
   --menuForegroundColor: var(--menuForegroundColor),
   --submenuColor: var(--submenuColor),
@@ -104,6 +106,8 @@ $variables: (
   --markdownTextareaBackgroundColor: var(--markdownTextareaBackgroundColor),
 
   --actionButtonColor: var(--actionButtonColor),
+  --activatedActionButtonColor: var(--activatedActionButtonColor),
+
   --supportButtonColor: var(--supportButtonColor),
   --supportButtonBackgroundColor: var(--supportButtonBackgroundColor),
   --supportButtonHeartColor: var(--supportButtonHeartColor),
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 33483533e..056b88fc1 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -521,6 +521,7 @@ p-toast {
   .ui-toast-message {
     font-family: $main-fonts;
     background-color: var(--mainBackgroundColor) !important;
+    color: var(--mainForegroundColor) !important;
     border-radius: 5px;
     box-sizing: border-box;
     border: 1px solid #EBEEF5 !important;