X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.scss;h=205a4333c5fc79fc51d5a272538e99aad7863fa2;hb=5f0805d39b94eb2de1b73e0f43ac8685ae900994;hp=1a59a1bd3536ef89d6f844a5705197fb2180b9d6;hpb=a01f107bc436250706d4bc765f45335ee15b8e80;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 1a59a1bd3..205a4333c 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -1,6 +1,25 @@
+@import '_variables';
+@import '_mixins';
+
 #video-container {
-  width: 100%;
-  height: 100%;
+  background-color: #000;
+  display: flex;
+  justify-content: center;
+
+  #video-element {
+    width: 888px;
+    height: 500px;
+
+    @media screen and (max-width: 800px) {
+      height: auto;
+    }
+
+    // VideoJS create an inner video player
+    video {
+      outline: 0;
+      position: relative !important;
+    }
+  }
 }
 
 #video-not-found {
@@ -11,171 +30,156 @@
   font-weight: bold;
 }
 
-.embed-responsive {
-  height: 500px;
+.video-bottom {
+  margin-top: 40px;
+  display: flex;
 
-  @media screen and (max-width: 600px) {
-    height: 300px;
-  }
-}
+  .video-info {
+    flex-grow: 1;
+    margin-right: 28px;
 
-#torrent-info {
-  font-size: 10px;
-  margin-top: 10px;
-  text-align: center;
+    .video-info-name-actions {
+      display: flex;
+      align-items: center;
 
-  div {
-    min-width: 60px;
-  }
-}
+      .video-info-name {
+        margin-right: 30px;
+        font-size: 27px;
+        font-weight: $font-semibold;
+        flex-grow: 1;
+      }
 
-#video-info {
-  .video-name-views {
-    font-weight: bold;
-    font-size: 18px;
-    min-height: $video-watch-title-height;
-    display: flex;
-    align-items: center;
+      .video-info-actions {
+        min-width: 215px;
 
-    .video-name {
-      padding-left: $video-watch-info-padding-left;
-    }
+        .action-button {
+          @include peertube-button;
+          @include grey-button;
 
-    .video-views {
-      text-align: right;
-      // Keep a symmetry with the video name
-      padding-right: $video-watch-info-padding-left
-    }
+          font-size: 15px;
+          font-weight: $font-semibold;
+          display: inline-block;
+          padding: 0 10px 0 10px;
 
-  }
+          .icon {
+            @include icon(21px);
 
-  .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;
+            position: relative;
+            top: -2px;
 
-    .video-small-block {
-      height: $video-watch-info-height;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      text-align: center;
+            &.icon-like {
+              background-image: url('../../../assets/images/video/like-grey.svg');
+            }
 
-      a {
-        cursor: pointer;
-        transition: color 0.3s;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        &, &:hover {
-          color: inherit;
-          text-decoration:none;
-        }
+            &.icon-dislike {
+              background-image: url('../../../assets/images/video/dislike-grey.svg');
+            }
 
-        &:hover {
-          color: #000 !important;
-        }
+            &.icon-share {
+              background-image: url('../../../assets/images/video/share.svg');
+            }
 
-        &:hover > .glyphicon {
-          opacity: 1 !important;
-        }
-      }
+            &.icon-more {
+              background-image: url('../../../assets/images/video/more.svg');
+              top: -1px;
+            }
+          }
 
-      .option .glyphicon {
-        font-size: 22px;
-        color: inherit;
-        opacity: 0.15;
-        margin-bottom: 10px;
-        transition: opacity 0.3s;
-      }
+          &.activated {
+            @include orange-button;
 
-      .video-small-block-text {
-        font-size: 15px;
-        font-weight: bold;
-      }
-    }
+            .icon-like {
+              background-image: url('../../../assets/images/video/like-white.svg');
+            }
 
-    .video-small-block:not(:last-child) {
-      border-width: 0 1px 0 0;
-      border-color: $video-watch-border-color;
-      border-style: solid;
-    }
+            .icon-dislike {
+              background-image: url('../../../assets/images/video/dislike-white.svg');
+            }
+          }
+        }
 
-    .video-small-block-author, .video-small-block-more {
-      a.option {
-        display: block;
+        .action-more {
+          display: inline-block;
 
-        .glyphicon {
-          display: block;
-        }
-      }
-    }
+          .dropdown-menu .dropdown-item {
+            padding: 6px 24px;
 
-    .video-small-block-share, .video-small-block-more {
-      a.option {
-        display: block;
+            .icon {
+              @include icon(24px);
 
-        .glyphicon {
-          display: block;
-        }
-      }
-    }
+              margin-right: 10px;
+              position: relative;
+              top: -1px;
+
+              &.icon-download {
+                background-image: url('../../../assets/images/video/download-black.svg');
+              }
 
-    .video-small-block-more .video-small-block-dropdown {
-      position: relative;
+              &.icon-alert {
+                background-image: url('../../../assets/images/video/alert.svg');
+              }
 
-      .dropdown-item .glyphicon {
-        margin-right: 5px;
+              &.icon-blacklist {
+                background-image: url('../../../assets/images/video/blacklist.svg');
+              }
+            }
+          }
+        }
       }
     }
 
-    .video-small-block-rating {
+    .video-info-date-views-bar {
+      display: flex;
 
-      .video-small-block-like {
+      .video-info-date-views {
+        font-size: 16px;
         margin-bottom: 10px;
+        flex-grow: 1;
       }
 
-      .video-small-block-text {
-        vertical-align: top;
-      }
+      .video-info-likes-dislikes-bar {
+        height: 5px;
+        width: 186px;
+        background-color: #E5E5E5;
+        margin-top: 25px;
 
-      .glyphicon {
-        font-size: 18px;
-        margin: 0 10px 0 0;
-        opacity: 0.3;
+        .likes-bar {
+          height: 100%;
+          background-color: #39CC0B;
+        }
       }
+    }
 
-      .interactive {
-        cursor: pointer;
-        transition: opacity, color 0.3s;
+    .video-info-channel {
+      font-weight: $font-semibold;
+      font-size: 15px;
+    }
 
-        &.activated, &:hover {
-          opacity: 1;
-          color: #000;
-        }
+    .video-info-by {
+      display: flex;
+      align-items: center;
+      font-size: 13px;
+
+      img {
+        width: 16px;
+        height: 16px;
+        margin-left: 3px;
       }
     }
-  }
 
-  .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-details-date {
-        font-weight: bold;
-        margin-bottom: 30px;
+      .description-loading {
+        display: inline-block;
       }
 
-      .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;
@@ -184,109 +188,70 @@
       }
     }
 
-    .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;
         }
       }
     }
-
-    .video-details-tags {
-      display: flex;
-      flex-wrap: wrap;
-
-      a {
-        margin: 0 3px 3px 0;
-        font-size: 11px;
-      }
-    }
   }
 
-  @media screen and (max-width: 800px) {
-    .video-name-views {
-      .video-name {
-        padding-left: 5px;
-        padding-right: 0px;
-      }
-
-      .video-views {
-        padding-left: 0px;
-        padding-right: 5px;
-      }
+  .other-videos {
+    .title-page {
+      margin-top: 0;
     }
 
-    .video-small-blocks {
-      a, .video-small-block-text {
-        font-size: 13px !important;
-      }
-
-      .glyphicon {
-        font-size: 18px !important;
-      }
+    /deep/ .video-miniature {
+      display: flex;
+      height: 100%;
+      margin-bottom: 20px;
 
-      .video-small-block-author {
-        padding-left: 10px;
-        padding-right: 10px;
+      .video-miniature-information {
+        margin-left: 10px;
       }
     }
+  }
+}
 
-    .video-details {
-      .video-details-date-description {
-        padding-left: 10px;
-        font-size: 13px !important;
-      }
-
-      .video-details-attributes {
-        font-size: 11px !important;
 
-        .video-details-attribute-label {
-          width: 50px;
-        }
-      }
-    }
+@media screen and (max-width: 1200px) {
+  .other-videos {
+    display: none;
   }
 
-  @media screen and (max-width: 500px) {
-    .video-name-views {
-      font-size: 16px !important;
-    }
-
-    // Keep the same hierarchy than max-width: 800px
-    .video-small-blocks {
-      a, .video-small-block-text {
-        font-size: 10px !important;
-      }
+  .video-bottom {
+    .video-info {
+      margin-right: 0;
 
-      .video-small-block-author {
-        padding-left: 5px;
-        padding-right: 5px;
+      .video-info-name-actions {
+        align-items: left;
+        flex-direction: column;
+        margin-bottom: 30px;
       }
-    }
 
-    .video-details {
-      .video-details-date-description {
+      .video-info-date-views-bar {
+        align-items: left;
+        flex-direction: column;
         margin-bottom: 30px;
-        width: 100%;
 
-        .video-details-date {
-          margin-bottom: 15px;
+        .video-info-likes-dislikes-bar {
+          margin-top: 0;
         }
       }
-
-      .video-details-attributes {
-        padding-left: 10px;
-        padding-right: 10px;
-      }
     }
   }
 }
+
+@media screen and (max-width: 800px) {
+  .video-bottom {
+    margin: 20px 0 0 0;
+  }
+}