Merge branch 'release/2.2.0' into develop

4 files changed, 12 insertions, 12 deletions

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 2f9067132..0702ebf22 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
@@ -122,7 +122,7 @@ my-peertube-checkbox {
     display: inline-block;
     margin-right: 25px;
 
-    color: $grey-foreground-color;
+    color: var(--greyForegroundColor);
     font-size: 15px;
   }
 
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
index 7c4656931..33204de3b 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
@@ -80,7 +80,7 @@
 
       .comment-date {
         font-size: 90%;
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         margin-left: 5px;
         text-decoration: none;
       }
@@ -108,7 +108,7 @@
       }
 
       &.comment-html-deleted {
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         margin-bottom: 1rem;
       }
     }
@@ -120,7 +120,7 @@
       ::ng-deep .dropdown-toggle,
       .comment-action-reply,
       .comment-action-delete {
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         cursor: pointer;
         margin-right: 10px;
 
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss b/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
index 0dd318cb0..db36dcd8b 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
@@ -22,7 +22,7 @@
     }
 
     .playlist-by-index {
-      color: $grey-foreground-color;
+      color: var(--greyForegroundColor);
       display: flex;
 
       .playlist-by {
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 977312a83..431a21039 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -255,21 +255,21 @@ $video-info-margin-left: 44px;
 
             &.action-button-like.activated {
               .count {
-                color: $activated-action-button-color;
+                color: var(--activatedActionButtonColor);
               }
 
               my-global-icon {
-                @include apply-svg-color($activated-action-button-color);
+                @include apply-svg-color(var(--activatedActionButtonColor));
               }
             }
 
             &.action-button-dislike.activated {
               .count {
-                color: $activated-action-button-color;
+                color: var(--activatedActionButtonColor);
               }
 
               my-global-icon {
-                @include apply-svg-color($activated-action-button-color);
+                @include apply-svg-color(var(--activatedActionButtonColor));
               }
             }
 
@@ -325,7 +325,7 @@ $video-info-margin-left: 44px;
             background-color: #909090;
 
             &.liked {
-              background-color: $activated-action-button-color;
+              background-color: var(--activatedActionButtonColor);
             }
           }
         }
@@ -356,7 +356,7 @@ $video-info-margin-left: 44px;
       .video-info-description-more {
         cursor: pointer;
         font-weight: $font-semibold;
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         font-size: 14px;
 
         .glyphicon {
@@ -379,7 +379,7 @@ $video-info-margin-left: 44px;
         min-width: 142px;
         padding-right: 5px;
         display: inline-block;
-        color: $grey-foreground-color;
+        color: var(--greyForegroundColor);
         font-weight: $font-bold;
       }