From: Rigel Kent <sendmemail@rigelk.eu>
Date: Tue, 24 Dec 2019 13:04:37 +0000 (+0100)
Subject: (css) transparent buttons in watch page
X-Git-Tag: v2.1.0-rc.1~147
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F2349%2Fhead;p=oweals%2Fpeertube.git

(css) transparent buttons in watch page
---

diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 25029623e..74ac64a63 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -124,7 +124,7 @@
                     <div
                       class="video-info-likes-dislikes-bar"
                     >
-                      <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
+                      <div class="likes-bar" [ngClass]="{ 'liked': userRating !== 'none' }" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
                     </div>
                   </div>
                 </div>
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 5da5a60dd..ef0b2d1c5 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -220,66 +220,73 @@ $video-info-margin-left: 44px;
           .action-button:not(:first-child),
           .action-dropdown,
           my-video-actions-dropdown {
-            margin-left: 10px;
+            margin-left: 5px;
           }
 
-          .action-button {
+          ::ng-deep.action-button {
             @include peertube-button;
-            @include grey-button;
             @include button-with-icon(21px, 0, -1px);
-            @include apply-svg-color($grey-foreground-color);
+            @include apply-svg-color(var(--actionButtonColor));
 
-            font-size: 15px;
+            font-size: 100%;
             font-weight: $font-semibold;
             display: inline-block;
             padding: 0 10px 0 10px;
             white-space: nowrap;
+            background-color: transparent !important;
+            color: var(--actionButtonColor);
+            text-transform: uppercase;
 
             &::after {
               display: none;
             }
 
-            .action-button-like,
-            .action-button-dislike {
+            &:hover {
+              opacity: 0.9;
+            }
+
+            &.action-button-like,
+            &.action-button-dislike {
+              filter: brightness(120%);
+
               .count {
                 margin-right: 5px;
               }
             }
 
             &.action-button-like.activated {
-              background-color: $green;
-
               .count {
-                color: #fff;
+                color: $activated-action-button-color;
               }
 
               my-global-icon {
-                @include apply-svg-color(#fff);
+                @include apply-svg-color($activated-action-button-color);
               }
             }
 
             &.action-button-dislike.activated {
-              background-color: $red;
-
               .count {
-                color: #fff;
+                color: $activated-action-button-color;
               }
 
               my-global-icon {
-                @include apply-svg-color(#fff);
+                @include apply-svg-color($activated-action-button-color);
               }
             }
 
             &.action-button-support {
               color: var(--supportButtonColor);
-              background-color: var(--supportButtonBackgroundColor);
 
-              &:hover {
-                opacity: 0.9;
+              my-global-icon {
+                @include apply-svg-color(var(--supportButtonColor));
               }
+            }
 
+            &.action-button-support {
               my-global-icon {
-                @include apply-svg-color(var(--supportButtonColor));
+                ::ng-deep path:first-child {
+                  fill: var(--supportButtonHeartColor) !important;
+                }
               }
             }
 
@@ -309,14 +316,18 @@ $video-info-margin-left: 44px;
           $likes-bar-height: 2px;
           height: $likes-bar-height;
           margin-top: -$likes-bar-height;
-          width: 186px;
-          background-color: $red;
+          width: 120px;
+          background-color: #ccc;
           position: relative;
           top: 10px;
 
           .likes-bar {
             height: 100%;
-            background-color: $green;
+            background-color: #909090;
+
+            &.liked {
+              background-color: $activated-action-button-color;
+            }
           }
         }
       }
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 751f101ed..9877a07d5 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -34,8 +34,10 @@ body {
   --inputColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
 
-  --supportButtonBackgroundColor: #{$support-button};
-  --supportButtonColor: #{$white};
+  --actionButtonColor: #{$grey-foreground-color};
+  --supportButtonBackgroundColor: #{transparent};
+  --supportButtonColor: #{var(--actionButtonColor)};
+  --supportButtonHeartColor: #{$support-button-heart};
 
   font-family: $main-fonts;
   font-weight: $font-regular;
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 0cec9c412..6dededb0e 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -14,7 +14,8 @@ $grey-foreground-hover-color: #303030;
 $orange-color: #F1680D;
 $orange-hover-color: #F97D46;
 
-$support-button: #38981a;
+$support-button: inherit;
+$support-button-heart: #e83e8c;
 
 $bg-color: #fff;
 $fg-color: #000;
@@ -61,6 +62,8 @@ $input-placeholder-color: #898989;
 
 $sub-menu-margin-bottom: 30px;
 
+$activated-action-button-color: black;
+
 /*** map theme ***/
 
 // pass variables into a sass map,
@@ -78,8 +81,10 @@ $variables: (
   --inputColor: var(--inputColor),
   --inputPlaceholderColor: var(--inputPlaceholderColor),
 
+  --actionButtonColor: var(--actionButtonColor),
   --supportButtonColor: var(--supportButtonColor),
   --supportButtonBackgroundColor: var(--supportButtonBackgroundColor),
+  --supportButtonHeartColor: var(--supportButtonHeartColor),
 
   --embedForegroundColor: var(--embedForegroundColor),
   --embedBigPlayBackgroundColor: var(--embedBigPlayBackgroundColor)