X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=b4d9841fe728d4a27e7e904e8a737199c3b0c05e;hb=13a6b53655cdd7baba494abc3c9ff52788d4651e;hp=06c2de7c6da6c1dbd924b9b1aa50ece879264075;hpb=be6a4802326b1748e85c0d6fdadf06e70e6ecbb0;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 06c2de7c6..b4d9841fe 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,11 +1,25 @@
-#video-container {
+@import '_variables';
+@import '_mixins';
+
+#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: 600px) {
+      height: auto;
+      max-height: calc(100vh - #{$header-height});
+    }
+
+    // VideoJS create an inner video player
+    video {
+      outline: 0;
+      position: relative !important;
+    }
   }
 }
 
@@ -14,170 +28,207 @@
   line-height: 300px;
   margin-top: 50px;
   text-align: center;
-  font-weight: bold;
+  font-weight: $font-semibold;
+  font-size: 15px;
 }
 
-#torrent-info {
-  font-size: 10px;
-  margin-top: 10px;
-  text-align: center;
-
-  div {
-    min-width: 60px;
-  }
-}
-
-#video-info {
-  .video-name-views {
-    font-weight: bold;
-    font-size: 18px;
-    min-height: $video-watch-title-height;
-    display: flex;
-    align-items: center;
-
-    .video-name {
-      padding-left: $video-watch-info-padding-left;
-    }
-
-    .video-views {
-      text-align: right;
-      // Keep a symmetry with the video name
-      padding-right: $video-watch-info-padding-left
-    }
-
-  }
+.video-bottom {
+  margin-top: 40px;
+  display: flex;
 
-  .video-small-blocks {
-    height: $video-watch-info-height;
-    color: $video-watch-info-color;
-    border-color: $video-watch-border-color;
-    border-width: 1px 0px;
-    border-style: solid;
+  .video-info {
+    flex-grow: 1;
+    margin-right: 40px;
+    // Set min width for flex item
+    min-width: 1px;
 
-    .video-small-block {
-      height: $video-watch-info-height;
+    .video-info-first-row {
       display: flex;
-      flex-direction: column;
-      justify-content: center;
-      text-align: center;
-
-      a {
-        cursor: pointer;
-        transition: color 0.3s;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        &, &:hover {
-          color: inherit;
-          text-decoration:none;
-        }
 
-        &:hover {
-          color: #000 !important;
-        }
+      & > div:first-child {
+        flex-grow: 1;
+      }
 
-        &:hover > .glyphicon {
-          opacity: 1 !important;
-        }
+      .video-info-name {
+        margin-right: 30px;
+        min-height: 40px; // Align with the action buttons
+        font-size: 27px;
+        font-weight: $font-semibold;
+        flex-grow: 1;
       }
 
-      .option .glyphicon {
-        font-size: 22px;
-        color: inherit;
-        opacity: 0.15;
+      .video-info-date-views {
+        font-size: 16px;
         margin-bottom: 10px;
-        transition: opacity 0.3s;
+        flex-grow: 1;
       }
 
-      .video-small-block-text {
+      .video-info-channel {
+        font-weight: $font-semibold;
         font-size: 15px;
-        font-weight: bold;
       }
-    }
 
-    .video-small-block:not(:last-child) {
-      border-width: 0 1px 0 0;
-      border-color: $video-watch-border-color;
-      border-style: solid;
-    }
+      .video-info-by a {
+        @include disable-default-a-behaviour;
 
-    .video-small-block-account, .video-small-block-more {
-      a.option {
-        display: block;
+        display: flex;
+        align-items: center;
+        font-size: 13px;
+        color: #000;
 
-        .glyphicon {
-          display: block;
+        span:hover {
+          opacity: 0.8;
         }
-      }
-    }
 
-    .video-small-block-share, .video-small-block-more {
-      a.option {
-        display: block;
+        img {
+          @include avatar(18px);
 
-        .glyphicon {
-          display: block;
+          margin-left: 7px;
         }
       }
-    }
-
-    .video-small-block-more .video-small-block-dropdown {
-      position: relative;
-
-      .dropdown-item .glyphicon {
-        margin-right: 5px;
-      }
-    }
-
-    .video-small-block-rating {
-
-      .video-small-block-like {
-        margin-bottom: 10px;
-      }
 
-      .video-small-block-text {
-        vertical-align: top;
+      my-video-feed {
+        margin-left: 5px;
+        margin-top: 1px;
       }
 
-      .glyphicon {
-        font-size: 18px;
-        margin: 0 10px 0 0;
-        opacity: 0.3;
-      }
+      .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;
+
+          .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;
+            padding: 0 10px 0 10px;
+            white-space: nowrap;
+
+            .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;
+              }
+            }
+
+            &.action-button-share {
+              width: 82px;
+            }
+
+            &.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');
+              }
+            }
+          }
+
+          .action-more {
+            display: inline-block;
+
+            .dropdown-menu .dropdown-item {
+              padding: 6px 24px;
+
+              .icon {
+                @include icon(24px);
+
+                margin-right: 10px;
+                position: relative;
+                top: -1px;
+
+                &.icon-download {
+                  background-image: url('../../../assets/images/video/download-black.svg');
+                }
+
+                &.icon-edit {
+                  background-image: url('../../../assets/images/global/edit-black.svg');
+                }
+
+                &.icon-alert {
+                  background-image: url('../../../assets/images/video/alert.svg');
+                }
+
+                &.icon-blacklist {
+                  background-image: url('../../../assets/images/video/blacklist.svg');
+                }
+              }
+            }
+          }
+        }
 
-      .interactive {
-        cursor: pointer;
-        transition: opacity, color 0.3s;
+        .video-info-likes-dislikes-bar {
+          height: 5px;
+          width: 186px;
+          background-color: #E5E5E5;
+          margin-top: 25px;
 
-        &.activated, &:hover {
-          opacity: 1;
-          color: #000;
+          .likes-bar {
+            height: 100%;
+            background-color: #39CC0B;
+          }
         }
       }
     }
-  }
 
-  .video-details {
-    margin-top: 30px;
+    .video-info-description {
+      margin: 20px 0;
+      font-size: 15px;
 
-    .video-details-date-description {
-      padding-left: $video-watch-info-padding-left;
+      .video-info-description-html {
+        @include peertube-word-wrap;
+      }
 
       .description-loading {
         display: inline-block;
       }
 
-      .video-details-date {
-        font-weight: bold;
-        margin-bottom: 30px;
-      }
-
-      .video-details-description-more {
+      .video-info-description-more {
         cursor: pointer;
-        margin-top: 15px;
-        font-weight: bold;
-        color: #acaeb7;
+        font-weight: $font-semibold;
+        color: #585858;
+        font-size: 14px;
 
         .glyphicon {
           position: relative;
@@ -186,109 +237,170 @@
       }
     }
 
-    .video-details-attributes {
-      font-weight: bold;
-      font-size: 12px;
-
-      .video-details-attribute {
-        display: flex;
+    .video-attributes .video-attribute {
+      font-size: 13px;
+      display: block;
+      margin-bottom: 12px;
 
-        .video-details-attribute-label {
-          color: $video-watch-info-color;
-          flex-basis: 60px;
-          flex-grow: 0;
-          flex-shrink: 0;
-          margin-right: 5px;
-        }
+      .video-attribute-label {
+        width: 86px;
+        display: inline-block;
+        color: #585858;
+        font-weight: $font-bold;
       }
     }
+  }
+
+  .other-videos {
+    padding-left: 1em;
+
+    .title-page {
+      margin-top: 0;
+    }
 
-    .video-details-tags {
+    /deep/ .video-miniature {
       display: flex;
-      flex-wrap: wrap;
+      height: 100%;
+      margin-bottom: 20px;
 
-      a {
-        margin: 0 3px 3px 0;
-        font-size: 11px;
+      .video-miniature-information {
+        margin-left: 10px;
       }
     }
   }
+}
 
-  @media screen and (max-width: 800px) {
-    .video-name-views {
-      .video-name {
-        padding-left: 5px;
-        padding-right: 0px;
-      }
+// If the view is not expanded, take into account the menu
+.privacy-concerns {
+  width: calc(100% - #{$menu-width});
+}
 
-      .video-views {
-        padding-left: 0px;
-        padding-right: 5px;
-      }
-    }
+:host-context(.expanded) {
+  .privacy-concerns {
+    width: 100%;
+  }
+}
 
-    .video-small-blocks {
-      a, .video-small-block-text {
-        font-size: 13px !important;
-      }
+.privacy-concerns {
+  position: fixed;
+  bottom: 0;
 
-      .glyphicon {
-        font-size: 18px !important;
-      }
+  padding: 5px 15px;
 
-      .video-small-block-account {
-        padding-left: 10px;
-        padding-right: 10px;
-      }
+  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;
+    }
+  }
+}
+
 
-    .video-details {
-      .video-details-date-description {
-        padding-left: 10px;
-        font-size: 13px !important;
+@media screen and (max-width: 1600px) {
+  .video-bottom {
+    .video-info {
+      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-details-attributes {
-        font-size: 11px !important;
+      .video-info-date-views {
+        flex-direction: column;
+        margin-bottom: 30px;
 
-        .video-details-attribute-label {
-          width: 50px;
+        .video-info-likes-dislikes-bar {
+          margin-top: 0;
         }
       }
+
+      .video-attributes .video-attribute {
+        margin-bottom: 5px;
+      }
     }
   }
+}
 
-  @media screen and (max-width: 500px) {
-    .video-name-views {
-      font-size: 16px !important;
-    }
+@media screen and (max-width: 1300px) {
+  .other-videos {
+    display: none;
+  }
 
-    // Keep the same hierarchy than max-width: 800px
-    .video-small-blocks {
-      a, .video-small-block-text {
-        font-size: 10px !important;
-      }
+  .privacy-concerns {
+    font-size: 12px;
+    padding: 2px 5px;
 
-      .video-small-block-account {
-        padding-left: 5px;
-        padding-right: 5px;
-      }
+    .privacy-concerns-text {
+      margin: 0;
     }
+  }
+}
 
-    .video-details {
-      .video-details-date-description {
-        margin-bottom: 30px;
-        width: 100%;
+@media screen and (max-width: 600px) {
+  .video-bottom {
+    margin: 20px 0 0 0;
 
-        .video-details-date {
-          margin-bottom: 15px;
+    .video-info {
+
+      .video-info-first-row {
+
+        .video-info-name {
+          font-size: 20px;
+          height: auto;
         }
       }
+    }
+  }
 
-      .video-details-attributes {
-        padding-left: 10px;
-        padding-right: 10px;
-      }
+  .privacy-concerns {
+    width: 100%;
+
+    strong {
+      display: none;
     }
   }
 }
+
+@media screen and (max-width: 450px) {
+  .video-bottom  .action-button .icon-text {
+    display: none !important;
+  }
+}