X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=1354de32e0f24bcf0750ff64a451b59dfc921985;hb=191764f30b0a812bf3a9dbdc7daf1d5afe25e12a;hp=fcf625d6c3d650b74e42b36b8bba78989328f34e;hpb=b9828abe54723ebffd2aabdad870b157518472b1;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 fcf625d6c..1354de32e 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,14 +1,48 @@
-#video-container {
+@import '_variables';
+@import '_mixins';
+
+.root-row {
+  flex-direction: column;
+}
+
+.blacklisted-label {
+  font-weight: $font-semibold;
+}
+
+#video-element-wrapper {
   background-color: #000;
   display: flex;
   justify-content: center;
+  flex-grow: 1;
+
+  .remote-server-down {
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+    background-color: #141313;
+    width: 100%;
+    font-size: 24px;
+    height: 500px;
+
+    @media screen and (max-width: 1000px) {
+      font-size: 20px;
+    }
+
+    @media screen and (max-width: 600px) {
+      font-size: 16px;
+    }
+  }
 
-  #video-element {
+  /deep/ .video-js {
     width: 888px;
     height: 500px;
 
-    @media screen and (max-width: 800px) {
-      height: auto;
+    &.vjs-theater-enabled {
+      height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
+      width: 100%;
     }
 
     // VideoJS create an inner video player
@@ -17,6 +51,18 @@
       position: relative !important;
     }
   }
+
+  @media screen and (max-width: 600px) {
+    .remote-server-down,
+    /deep/ .video-js {
+      width: 100vw;
+      height: calc(100vw / 1.7); // 16/9
+    }
+  }
+}
+
+.alert {
+  text-align: center;
 }
 
 #video-not-found {
@@ -24,140 +70,226 @@
   line-height: 300px;
   margin-top: 50px;
   text-align: center;
-  font-weight: bold;
+  font-weight: $font-semibold;
+  font-size: 15px;
 }
 
 .video-bottom {
   margin-top: 40px;
   display: flex;
+  flex-grow: 1;
 
   .video-info {
     flex-grow: 1;
-    margin-right: 28px;
+    margin-right: 40px;
+    // Set min width for flex item
+    min-width: 1px;
 
-    .video-info-name-actions {
+    .video-info-first-row {
       display: flex;
-      align-items: center;
+
+      & > div:first-child {
+        flex-grow: 1;
+      }
 
       .video-info-name {
+        margin-right: 30px;
+        min-height: 40px; // Align with the action buttons
         font-size: 27px;
         font-weight: $font-semibold;
         flex-grow: 1;
       }
 
-      .video-info-actions {
-        .action-button {
-          @include peertube-button;
-          @include grey-button;
-
-          font-size: 15px;
-          font-weight: $font-semibold;
-          display: inline-block;
-          padding: 0 10px 0 10px;
+      .video-info-date-views {
+        font-size: 16px;
+        margin-bottom: 10px;
+        flex-grow: 1;
+      }
 
-          .icon {
-            @include icon(21px);
+      .video-info-channel {
+        font-weight: $font-semibold;
+        font-size: 15px;
 
-            position: relative;
-            top: -2px;
+        a {
+          @include disable-default-a-behaviour;
 
-            &.icon-like {
-              background-image: url('../../../assets/images/video/like-grey.svg');
-            }
+          color: #000;
 
-            &.icon-dislike {
-              background-image: url('../../../assets/images/video/dislike-grey.svg');
-            }
+          &:hover {
+            opacity: 0.8;
+          }
 
-            &.icon-share {
-              background-image: url('../../../assets/images/video/share.svg');
-            }
+          img {
+            @include avatar(18px);
 
-            &.icon-more {
-              background-image: url('../../../assets/images/video/more.svg');
-              top: -1px;
-            }
+            margin: -2px 2px 0 5px;
           }
+        }
+      }
 
-          &.activated {
-            @include orange-button;
+      .video-info-by {
 
-            .icon-like {
-              background-image: url('../../../assets/images/video/like-white.svg');
-            }
+        a {
+          @include disable-default-a-behaviour;
 
-            .icon-dislike {
-              background-image: url('../../../assets/images/video/dislike-white.svg');
-            }
+          display: inline;
+          align-items: center;
+          font-size: 13px;
+          color: #000;
+
+          span:hover {
+            opacity: 0.8;
+          }
+
+          img {
+            @include avatar(18px);
+
+            margin-top: -2px;
+            margin-left: 7px;
           }
         }
 
-        .action-more {
-          display: inline-block;
+        my-help {
+          position: relative;
+          top: 1px;
+          margin-left: 2px;
+        }
+      }
+
+      my-video-feed {
+        margin-left: 5px;
+        margin-top: 1px;
+      }
+
+      .video-actions-rates {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+
+        .video-actions {
+          height: 40px; // Align with the title
+          display: flex;
+          align-items: center;
 
-          .dropdown-menu .icon {
+          .action-button:not(:first-child), .action-more {
+            margin-left: 10px;
+          }
+
+          .action-button {
+            @include peertube-button;
+            @include grey-button;
+
+            font-size: 15px;
+            font-weight: $font-semibold;
             display: inline-block;
-            background-repeat: no-repeat;
-            background-size: contain;
-            width: 21px;
-            height: 21px;
-            vertical-align: middle;
-            margin-right: 5px;
-            position: relative;
-            top: -1px;
-
-            &.icon-download {
-              background-image: url('../../../assets/images/video/download-grey.svg');
+            padding: 0 10px 0 10px;
+            white-space: nowrap;
+
+            &::after {
+              display: none;
+            }
+
+            .icon {
+              @include icon(21px);
+
+              position: relative;
+              top: -2px;
+
+              &.icon-like {
+                background-image: url('../../../assets/images/video/like-grey.svg');
+              }
+
+              &.icon-dislike {
+                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');
+              }
+
+              &.icon-more {
+                background-image: url('../../../assets/images/video/more.svg');
+                top: -1px;
+              }
             }
 
-            &.icon-alert {
-              background-image: url('../../../assets/images/video/alert.svg');
+            .icon-text {
+              margin-left: 3px;
             }
 
-            &.icon-blacklist {
-              background-image: url('../../../assets/images/video/eye-closed.svg');
+            &.action-button-like.activated {
+              background-color: #39CC0B;
+
+              .icon-like {
+                background-image: url('../../../assets/images/video/like-white.svg');
+              }
+            }
+
+            &.action-button-dislike.activated {
+              background-color: #FF0000;
+
+              .icon-dislike {
+                background-image: url('../../../assets/images/video/dislike-white.svg');
+              }
             }
           }
-        }
-      }
-    }
 
-    .video-info-date-views-bar {
-      display: flex;
+          .action-more {
+            display: inline-block;
 
-      .video-info-date-views {
-        font-size: 16px;
-        margin-bottom: 10px;
-        flex-grow: 1;
-      }
+            .dropdown-menu .dropdown-item {
+              padding: 6px 24px;
 
-      .video-info-likes-dislikes-bar {
-        height: 5px;
-        width: 186px;
-        background-color: #E5E5E5;
-        margin-top: 25px;
+              .icon {
+                @include icon(24px);
 
-        .likes-bar {
-          height: 100%;
-          background-color: #39CC0B;
-        }
-      }
-    }
+                margin-right: 10px;
+                position: relative;
+                top: -1px;
 
-    .video-info-channel {
-      font-weight: $font-semibold;
-      font-size: 15px;
-    }
+                &.icon-download {
+                  background-image: url('../../../assets/images/video/download-black.svg');
+                }
 
-    .video-info-by {
-      display: flex;
-      align-items: center;
-      font-size: 13px;
+                &.icon-edit {
+                  background-image: url('../../../assets/images/global/edit-black.svg');
+                }
 
-      img {
-        width: 16px;
-        height: 16px;
-        margin-left: 3px;
+                &.icon-alert {
+                  background-image: url('../../../assets/images/video/alert.svg');
+                }
+
+                &.icon-blacklist {
+                  background-image: url('../../../assets/images/video/blacklist.svg');
+                }
+
+                &.icon-unblacklist {
+                  background-image: url('../../../assets/images/global/undo.svg');
+                }
+
+                &.icon-delete {
+                  background-image: url('../../../assets/images/global/delete-black.svg');
+                }
+              }
+            }
+          }
+        }
+
+        .video-info-likes-dislikes-bar {
+          height: 5px;
+          width: 186px;
+          background-color: #E5E5E5;
+          margin-top: 25px;
+
+          .likes-bar {
+            height: 100%;
+            background-color: #39CC0B;
+          }
+        }
       }
     }
 
@@ -165,6 +297,14 @@
       margin: 20px 0;
       font-size: 15px;
 
+      .video-info-description-html {
+        @include peertube-word-wrap;
+      }
+
+      .glyphicon, .description-loading {
+        margin-left: 3px;
+      }
+
       .description-loading {
         display: inline-block;
       }
@@ -182,23 +322,41 @@
       }
     }
 
-    .video-attributes {
-      .video-attribute {
-        font-size: 13px;
-        display: block;
-        margin-bottom: 12px;
+    .video-attributes .video-attribute {
+      font-size: 13px;
+      display: block;
+      margin-bottom: 12px;
+
+      .video-attribute-label {
+        min-width: 91px;
+        padding-right: 5px;
+        display: inline-block;
+        color: #585858;
+        font-weight: $font-bold;
+      }
+
+      a.video-attribute-value {
+        @include disable-default-a-behaviour;
+        color: #000;
 
-        .video-attribute-label {
-          width: 86px;
-          display: inline-block;
-          color: #585858;
-          font-weight: $font-bold;
+        &:hover {
+          opacity: 0.9;
+        }
+      }
+
+      &.video-attribute-tags {
+        .video-attribute-value:not(:nth-child(2)) {
+          &::before {
+            content: ', '
+          }
         }
       }
     }
   }
 
   .other-videos {
+    padding-left: 1em;
+
     .title-page {
       margin-top: 0;
     }
@@ -207,30 +365,90 @@
       display: flex;
       height: 100%;
       margin-bottom: 20px;
+      flex-wrap: wrap;
 
       .video-miniature-information {
+        flex-grow: 1;
         margin-left: 10px;
       }
     }
   }
 }
 
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
 
-@media screen and (max-width: 800px) {
-  .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 {
-      .video-info-name-actions {
-        align-items: left;
+      margin-right: 20px;
+
+      .video-info-first-row {
         flex-direction: column;
         margin-bottom: 30px;
+
+        .video-actions-rates {
+          margin-top: 20px;
+          align-items: start;
+
+          .video-info-likes-dislikes-bar {
+            margin-top: 10px;
+          }
+        }
       }
 
-      .video-info-date-views-bar {
-        align-items: left;
+      .video-info-date-views {
         flex-direction: column;
         margin-bottom: 30px;
 
@@ -238,6 +456,70 @@
           margin-top: 0;
         }
       }
+
+      .video-attributes .video-attribute {
+        margin-bottom: 5px;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 1300px) {
+  .video-bottom {
+    flex-direction: column;
+  }
+
+  .other-videos {
+    padding-left: 0 !important;
+  }
+
+  .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;
+
+    .video-info {
+
+      .video-info-first-row {
+
+        .video-info-name {
+          font-size: 20px;
+          height: auto;
+        }
+      }
+    }
+  }
+
+  .other-videos {
+    /deep/ .video-miniature  {
+      flex-direction: column;
+
+      .video-miniature-information {
+        margin-left: 0 !important;
+      }
+    }
+  }
+
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
+    }
+  }
+}
+
+@media screen and (max-width: 450px) {
+  .video-bottom  .action-button .icon-text {
+    display: none !important;
+  }
+}