rename blacklist to block/blocklist, merge block and auto-block views

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-watch / video-watch.component.scss

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 ae79c2ff6c19cf74d3f11a7177d7ab260b0fc4f6..e0d41117a0aabd9e9806778464500a29daca6a75 100644 (file)
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -45,7 +45,7 @@ $video-info-margin-left: 44px;
   }
 }
 
-.blacklisted-label {
+.blocked-label {
   font-weight: $font-semibold;
 }
 
@@ -53,7 +53,6 @@ $video-info-margin-left: 44px;
   background-color: #000;
   display: flex;
   justify-content: center;
-  margin: 0 -15px;
 
   #videojs-wrapper {
     display: flex;
@@ -167,7 +166,7 @@ $video-info-margin-left: 44px;
         a {
           @include disable-default-a-behaviour;
 
-          color: var(--mainForegroundColor);
+          color: pvar(--mainForegroundColor);
 
           &:hover {
             opacity: 0.8;
@@ -226,7 +225,7 @@ $video-info-margin-left: 44px;
           ::ng-deep.action-button {
             @include peertube-button;
             @include button-with-icon(21px, 0, -1px);
-            @include apply-svg-color(var(--actionButtonColor));
+            @include apply-svg-color(pvar(--actionButtonColor));
 
             font-size: 100%;
             font-weight: $font-semibold;
@@ -234,7 +233,7 @@ $video-info-margin-left: 44px;
             padding: 0 10px 0 10px;
             white-space: nowrap;
             background-color: transparent !important;
-            color: var(--actionButtonColor);
+            color: pvar(--actionButtonColor);
             text-transform: uppercase;
 
             &::after {
@@ -256,36 +255,36 @@ $video-info-margin-left: 44px;
 
             &.action-button-like.activated {
               .count {
-                color: $activated-action-button-color;
+                color: pvar(--activatedActionButtonColor);
               }
 
               my-global-icon {
-                @include apply-svg-color($activated-action-button-color);
+                @include apply-svg-color(pvar(--activatedActionButtonColor));
               }
             }
 
             &.action-button-dislike.activated {
               .count {
-                color: $activated-action-button-color;
+                color: pvar(--activatedActionButtonColor);
               }
 
               my-global-icon {
-                @include apply-svg-color($activated-action-button-color);
+                @include apply-svg-color(pvar(--activatedActionButtonColor));
               }
             }
 
             &.action-button-support {
-              color: var(--supportButtonColor);
+              color: pvar(--supportButtonColor);
 
               my-global-icon {
-                @include apply-svg-color(var(--supportButtonColor));
+                @include apply-svg-color(pvar(--supportButtonColor));
               }
             }
 
             &.action-button-support {
               my-global-icon {
                 ::ng-deep path:first-child {
-                  fill: var(--supportButtonHeartColor) !important;
+                  fill: pvar(--supportButtonHeartColor) !important;
                 }
               }
             }
@@ -326,7 +325,7 @@ $video-info-margin-left: 44px;
             background-color: #909090;
 
             &.liked {
-              background-color: $activated-action-button-color;
+              background-color: pvar(--activatedActionButtonColor);
             }
           }
         }
@@ -357,7 +356,7 @@ $video-info-margin-left: 44px;
       .video-info-description-more {
         cursor: pointer;
         font-weight: $font-semibold;
-        color: $grey-foreground-color;
+        color: pvar(--greyForegroundColor);
         font-size: 14px;
 
         .glyphicon {
@@ -380,13 +379,13 @@ $video-info-margin-left: 44px;
         min-width: 142px;
         padding-right: 5px;
         display: inline-block;
-        color: $grey-foreground-color;
+        color: pvar(--greyForegroundColor);
         font-weight: $font-bold;
       }
 
       a.video-attribute-value {
         @include disable-default-a-behaviour;
-        color: var(--mainForegroundColor);
+        color: pvar(--mainForegroundColor);
 
         &:hover {
           opacity: 0.9;
@@ -443,6 +442,7 @@ my-video-comments {
 
 // If the view is not expanded, take into account the menu
 .privacy-concerns {
+  z-index: z(dropdown) + 1;
   width: calc(100% - #{$menu-width});
 }
 
@@ -469,7 +469,7 @@ my-video-comments {
   display: flex;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: flex-start;
+  justify-content: space-between;
   background-color: rgba(0, 0, 0, 0.9);
   color: #fff;
 
@@ -480,7 +480,7 @@ my-video-comments {
   a {
     @include disable-default-a-behaviour;
 
-    color: var(--mainColor);
+    color: pvar(--mainColor);
     transition: color 0.3s;
 
     &:hover {
@@ -488,11 +488,11 @@ my-video-comments {
     }
   }
 
-  .privacy-concerns-okay {
-    background-color: var(--mainColor);
+  .privacy-concerns-button {
     padding: 5px 8px 5px 7px;
     margin-left: auto;
     border-radius: 3px;
+    white-space: nowrap;
     cursor: pointer;
     transition: background-color 0.3s;
     font-weight: $font-semibold;
@@ -501,6 +501,11 @@ my-video-comments {
       background-color: #000;
     }
   }
+
+  .privacy-concerns-okay {
+    background-color: pvar(--mainColor);
+    margin-left: 10px;
+  }
 }
 
 @media screen and (max-width: 1600px) {
@@ -546,7 +551,8 @@ my-video-comments {
 
 @media screen and (max-width: 600px) {
   .video-bottom {
-    margin: 20px 0 0 0 !important;
+    margin-top: 20px !important;
+    margin-bottom: 20px !important;
 
     .video-info {
       padding: 0;