X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=8bc9f8d9a816cd3e66927a0d90d4c5a20a966b02;hb=80109b2ddb14ec4a54cede7885611cb9244da3cb;hp=c8859619664d71438d56d3116e4f0f073fd07f63;hpb=196b7790d60c0b374b45d061b9dcbde3ccb80b3e;p=github%2FChocobozzz%2FPeerTube.git

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 c88596196..8bc9f8d9a 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,17 +1,18 @@
 @import '_variables';
 @import '_mixins';
 
-#video-container {
+#video-element-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
 
-  #video-element {
+  /deep/ .video-js {
     width: 888px;
     height: 500px;
 
-    @media screen and (max-width: 800px) {
+    @media screen and (max-width: 600px) {
       height: auto;
+      max-height: calc(100vh - #{$header-height});
     }
 
     // VideoJS create an inner video player
@@ -37,7 +38,9 @@
 
   .video-info {
     flex-grow: 1;
-    margin-right: 28px;
+    margin-right: 40px;
+    // Set min width for flex item
+    min-width: 1px;
 
     .video-info-first-row {
       display: flex;
@@ -70,6 +73,11 @@
         align-items: center;
         font-size: 13px;
 
+        a {
+          color: black;
+          display: inline-block;
+        }
+
         img {
           @include avatar(18px);
 
@@ -77,6 +85,11 @@
         }
       }
 
+      my-video-feed {
+        margin-left: 5px;
+        margin-top: 1px;
+      }
+
       .video-actions-rates {
         display: flex;
         flex-direction: column;
@@ -99,6 +112,7 @@
             font-weight: $font-semibold;
             display: inline-block;
             padding: 0 10px 0 10px;
+            white-space: nowrap;
 
             .icon {
               @include icon(21px);
@@ -114,6 +128,10 @@
                 background-image: url('../../../assets/images/video/dislike-grey.svg');
               }
 
+              &.icon-support {
+                background-image: url('../../../assets/images/video/heart.svg');
+              }
+
               &.icon-share {
                 background-image: url('../../../assets/images/video/share.svg');
               }
@@ -196,6 +214,11 @@
       margin: 20px 0;
       font-size: 15px;
 
+      .video-info-description-html {
+        word-wrap: break-word;
+        text-align: justify;
+      }
+
       .description-loading {
         display: inline-block;
       }
@@ -244,15 +267,64 @@
   }
 }
 
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
 
-@media screen and (max-width: 1300px) {
-  .other-videos {
-    display: none;
+:host-context(.expanded) {
+  .privacy-concerns {
+    width: 100%;
+  }
+}
+
+.privacy-concerns {
+  position: fixed;
+  bottom: 0;
+
+  padding: 5px 15px;
+
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: #fff;
+
+  .privacy-concerns-text {
+    margin: 0 5px;
+  }
+
+  a {
+    @include disable-default-a-behaviour;
+
+    color: $orange-color;
+    transition: color 0.3s;
+
+    &:hover {
+      color: #fff;
+    }
+  }
+
+  .privacy-concerns-okay {
+    background-color: $orange-color;
+    padding: 5px 8px 5px 7px;
+    margin-left: auto;
+    border-radius: 3px;
+    cursor: pointer;
+    transition: background-color 0.3s;
+    font-weight: $font-semibold;
+
+    &:hover {
+      background-color: #000;
+    }
   }
+}
+
 
+@media screen and (max-width: 1600px) {
   .video-bottom {
     .video-info {
-      margin-right: 0;
+      margin-right: 20px;
 
       .video-info-first-row {
         flex-direction: column;
@@ -260,7 +332,7 @@
 
         .video-actions-rates {
           margin-top: 20px;
-          align-items: left;
+          align-items: start;
 
           .video-info-likes-dislikes-bar {
             margin-top: 10px;
@@ -284,6 +356,21 @@
   }
 }
 
+@media screen and (max-width: 1300px) {
+  .other-videos {
+    display: none;
+  }
+
+  .privacy-concerns {
+    font-size: 12px;
+    padding: 2px 5px;
+
+    .privacy-concerns-text {
+      margin: 0;
+    }
+  }
+}
+
 @media screen and (max-width: 600px) {
   .video-bottom {
     margin: 20px 0 0 0;
@@ -299,4 +386,18 @@
       }
     }
   }
+
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
+    }
+  }
+}
+
+@media screen and (max-width: 450px) {
+  .video-bottom  .action-button .icon-text {
+    display: none !important;
+  }
 }