8 files changed, 81 insertions, 57 deletions

diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss b/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
index 75827abbf..7a4fdb34d 100644
--- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
+++ b/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
@@ -9,6 +9,8 @@ input[type=password] {
 
 input[type=submit] {
   @include peertube-button;
+  @include orange-button;
+
   margin-top: 15px;
 }
 
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.scss b/client/src/app/account/account-settings/account-details/account-details.component.scss
index 687166d9e..5c369f968 100644
--- a/client/src/app/account/account-settings/account-details/account-details.component.scss
+++ b/client/src/app/account/account-settings/account-details/account-details.component.scss
@@ -6,6 +6,7 @@ label {
 
 input[type=submit] {
   @include peertube-button;
+  @include orange-button;
 
   display: block;
   margin-top: 15px;
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/account/account-videos/account-videos.component.scss
index e76e3f4e5..04aaa8e89 100644
--- a/client/src/app/account/account-videos/account-videos.component.scss
+++ b/client/src/app/account/account-videos/account-videos.component.scss
@@ -42,7 +42,7 @@
     top: -2px;
 
     &.icon-edit {
-      background-image: url('../../../assets/images/account/edit.svg');
+      background-image: url('../../../assets/images/global/edit.svg');
     }
 
     &.icon-delete-grey {
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index 7ba8ef26c..e7761a9df 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -10,7 +10,7 @@
 
 .icon.icon-search {
   display: inline-block;
-  background: url('../../../assets/images/header/search.svg') no-repeat;
+  background: url('../../assets/images/header/search.svg') no-repeat;
   background-size: contain;
   width: 25px;
   height: 21px;
@@ -24,12 +24,13 @@
 
 .upload-button {
   @include peertube-button-link;
+  @include orange-button;
 
   margin-right: 25px;
 
   .icon.icon-upload {
     display: inline-block;
-    background: url('../../../assets/images/header/upload.svg') no-repeat;
+    background: url('../../assets/images/header/upload.svg') no-repeat;
     background-size: contain;
     width: 22px;
     height: 24px;
diff --git a/client/src/app/login/login.component.scss b/client/src/app/login/login.component.scss
index fd6981c59..3b4326de4 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/login/login.component.scss
@@ -5,4 +5,5 @@ input:not([type=submit]) {
 
 input[type=submit] {
   @include peertube-button;
+  @include orange-button;
 }
diff --git a/client/src/app/signup/signup.component.scss b/client/src/app/signup/signup.component.scss
index fd6981c59..3b4326de4 100644
--- a/client/src/app/signup/signup.component.scss
+++ b/client/src/app/signup/signup.component.scss
@@ -5,4 +5,5 @@ input:not([type=submit]) {
 
 input[type=submit] {
   @include peertube-button;
+  @include orange-button;
 }
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 88d89f9e4..583da4685 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -14,18 +14,12 @@
       <div class="video-info-name">{{ video.name }}</div>
 
       <div class="video-info-actions">
-        <div class="action-button">
-          <span
-              class="icon icon-like" title="Like this video"
-              [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'like' }" (click)="setLike()"
-          ></span>
+        <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" class="action-button">
+          <span class="icon icon-like" title="Like this video" (click)="setLike()"></span>
         </div>
 
-        <div class="action-button">
-          <span
-            class="icon icon-dislike" title="Dislike this video"
-            [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'dislike' }" (click)="setDislike()"
-          ></span>
+        <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" class="action-button">
+          <span class="icon icon-dislike" title="Dislike this video" (click)="setDislike()"></span>
         </div>
 
         <div (click)="showShareModal()" class="action-button">
@@ -39,33 +33,21 @@
           </div>
 
           <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
-            <li *ngIf="canUserUpdateVideo()" role="menuitem">
-              <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.uuid ]">
-                <span class="glyphicon glyphicon-pencil"></span> Update
-              </a>
-            </li>
-
             <li role="menuitem">
               <a class="dropdown-item" title="Download the video" href="#" (click)="showDownloadModal($event)">
-                <span class="glyphicon glyphicon-download-alt"></span> Download
+                <span class="icon icon-download"></span> Download
               </a>
             </li>
 
             <li *ngIf="isUserLoggedIn()" role="menuitem">
               <a class="dropdown-item" title="Report this video" href="#" (click)="showReportModal($event)">
-                <span class="glyphicon glyphicon-alert"></span> Report
-              </a>
-            </li>
-
-            <li *ngIf="isVideoRemovable()" role="menuitem">
-              <a class="dropdown-item" title="Delete this video" href="#" (click)="removeVideo($event)">
-                <span class="glyphicon glyphicon-remove"></span> Delete
+                <span class="icon icon-alert"></span> Report
               </a>
             </li>
 
             <li *ngIf="isVideoBlacklistable()" role="menuitem">
               <a class="dropdown-item" title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
-                <span class="glyphicon glyphicon-eye-close"></span> Blacklist
+                <span class="icon icon-blacklist"></span> Blacklist
               </a>
             </li>
           </ul>
@@ -78,7 +60,7 @@
         {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
       </div>
 
-      <div class="video-info-likes-dislikes-bar">
+      <div *ngIf="video.likes !== 0 || video.dislikes !== 0" class="video-info-likes-dislikes-bar">
         <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></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 d7f47ed75..3f36410f4 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -6,6 +6,11 @@
   #video-element {
     width: 888px;
     height: 500px;
+
+    // VideoJS create an inner video player
+    video {
+      outline: 0;
+    }
   }
 }
 
@@ -38,47 +43,78 @@
       .video-info-actions {
         .action-button {
           @include peertube-button;
+          @include grey-button;
 
           font-size: 15px;
           font-weight: $font-semibold;
-          color: #585858;
-          background-color: #E5E5E5;
           display: inline-block;
           padding: 0 10px 0 10px;
 
-          &:hover {
-            background-color: #EFEFEF;
+          .icon {
+            display: inline-block;
+            background-repeat: no-repeat;
+            background-size: contain;
+            width: 21px;
+            height: 21px;
+            vertical-align: middle;
+            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-share {
+              background-image: url('../../../assets/images/video/share.svg');
+            }
+
+            &.icon-more {
+              background-image: url('../../../assets/images/video/more.svg');
+            }
           }
-        }
 
-        .action-more {
-          display: inline-block;
-        }
+          &.activated {
+            @include orange-button;
 
-        .icon {
-          display: inline-block;
-          background-repeat: no-repeat;
-          background-size: contain;
-          width: 21px;
-          height: 21px;
-          vertical-align: middle;
-          position: relative;
-          top: -2px;
-
-          &.icon-like {
-            background-image: url('../../../assets/images/video/like.svg');
-          }
+            .icon-like {
+              background-image: url('../../../assets/images/video/like-white.svg');
+            }
 
-          &.icon-dislike {
-            background-image: url('../../../assets/images/video/dislike.svg');
+            .icon-dislike {
+              background-image: url('../../../assets/images/video/dislike-white.svg');
+            }
           }
+        }
 
-          &.icon-share {
-            background-image: url('../../../assets/images/video/share.svg');
-          }
+        .action-more {
+          display: inline-block;
 
-          &.icon-more {
-            background-image: url('../../../assets/images/video/more.svg');
+          .dropdown-menu .icon {
+            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.svg');
+            }
+
+            &.icon-alert {
+              background-image: url('../../../assets/images/video/alert.svg');
+            }
+
+            &.icon-blacklist {
+              background-image: url('../../../assets/images/video/eye-closed.svg');
+            }
           }
         }
       }