Refactor modal buttons style

13 files changed, 33 insertions, 53 deletions

diff --git a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html
index 17e9ce4cf..ab6967f28 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html
+++ b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.html
@@ -41,7 +41,7 @@
       </div>
 
       <div class="form-group inputs">
-        <input type="submit" i18n-value value="Add a message" class="action-button-submit" [disabled]="!form.valid || sendingMessage">
+        <input type="submit" i18n-value value="Add a message" class="peertube-button orange-button" [disabled]="!form.valid || sendingMessage">
       </div>
     </form>
 
diff --git a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html
index 8082e93f4..cc7bb6c92 100644
--- a/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html
+++ b/client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.html
@@ -23,14 +23,11 @@
 
       <div class="form-group inputs">
         <input
-          type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+          type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
           (click)="hide()" (key.enter)="hide()"
         >
 
-        <input
-          type="submit" i18n-value value="Update this comment" class="action-button-submit"
-          [disabled]="!form.valid"
-        >
+        <input type="submit" i18n-value value="Update this comment" class="peertube-button orange-button" [disabled]="!form.valid" />
       </div>
     </form>
   </div>
diff --git a/client/src/app/shared/shared-moderation/batch-domains-modal.component.html b/client/src/app/shared/shared-moderation/batch-domains-modal.component.html
index 1b85c8f48..6a3c65721 100644
--- a/client/src/app/shared/shared-moderation/batch-domains-modal.component.html
+++ b/client/src/app/shared/shared-moderation/batch-domains-modal.component.html
@@ -28,14 +28,11 @@
 
       <div class="form-group inputs">
         <input
-          type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+          type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
           (click)="hide()" (key.enter)="hide()"
         >
 
-        <input
-          type="submit" [value]="action" class="action-button-submit"
-          [disabled]="!form.valid"
-        >
+        <input type="submit" [value]="action" class="peertube-button orange-button" [disabled]="!form.valid" />
       </div>
     </form>
   </div>
diff --git a/client/src/app/shared/shared-moderation/report-modals/report.component.html b/client/src/app/shared/shared-moderation/report-modals/report.component.html
index bda62312f..6c99180ef 100644
--- a/client/src/app/shared/shared-moderation/report-modals/report.component.html
+++ b/client/src/app/shared/shared-moderation/report-modals/report.component.html
@@ -51,10 +51,11 @@
 
     <div class="form-group inputs">
       <input
-        type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+        type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
         (click)="hide()" (key.enter)="hide()"
       >
-      <input type="submit" i18n-value value="Submit" class="action-button-submit" [disabled]="!form.valid">
+
+      <input type="submit" i18n-value value="Submit" class="peertube-button orange-button" [disabled]="!form.valid">
     </div>
 
     </form>
diff --git a/client/src/app/shared/shared-moderation/report-modals/video-report.component.html b/client/src/app/shared/shared-moderation/report-modals/video-report.component.html
index 4947088d1..1aae64bff 100644
--- a/client/src/app/shared/shared-moderation/report-modals/video-report.component.html
+++ b/client/src/app/shared/shared-moderation/report-modals/video-report.component.html
@@ -89,10 +89,11 @@
 
     <div class="form-group inputs">
       <input
-        type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+        type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
         (click)="hide()" (key.enter)="hide()"
       >
-      <input type="submit" i18n-value value="Submit" class="action-button-submit" [disabled]="!form.valid">
+
+      <input type="submit" i18n-value value="Submit" class="peertube-button orange-button" [disabled]="!form.valid">
     </div>
 
     </form>
diff --git a/client/src/app/shared/shared-moderation/user-ban-modal.component.html b/client/src/app/shared/shared-moderation/user-ban-modal.component.html
index 365eb1938..7129b00ca 100644
--- a/client/src/app/shared/shared-moderation/user-ban-modal.component.html
+++ b/client/src/app/shared/shared-moderation/user-ban-modal.component.html
@@ -23,14 +23,11 @@
 
       <div class="form-group inputs">
         <input
-          type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+          type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
           (click)="hide()" (key.enter)="hide()"
         >
 
-        <input
-          type="submit" i18n-value value="Ban this user" class="action-button-submit"
-          [disabled]="!form.valid"
-        >
+        <input type="submit" i18n-value value="Ban this user" class="peertube-button orange-button" [disabled]="!form.valid" />
       </div>
     </form>
   </div>
diff --git a/client/src/app/shared/shared-moderation/video-block.component.html b/client/src/app/shared/shared-moderation/video-block.component.html
index e982c4d77..5e9e8493c 100644
--- a/client/src/app/shared/shared-moderation/video-block.component.html
+++ b/client/src/app/shared/shared-moderation/video-block.component.html
@@ -35,14 +35,11 @@
 
       <div class="form-group inputs">
         <input
-          type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+          type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
           (click)="hide()" (key.enter)="hide()"
         >
 
-        <input
-          type="submit" i18n-value value="Submit" class="action-button-submit"
-          [disabled]="!form.valid"
-        >
+        <input type="submit" i18n-value value="Submit" class="peertube-button orange-button" [disabled]="!form.valid" />
       </div>
     </form>
 
diff --git a/client/src/app/shared/shared-support-modal/support-modal.component.html b/client/src/app/shared/shared-support-modal/support-modal.component.html
index 4a967987f..289adcb6a 100644
--- a/client/src/app/shared/shared-support-modal/support-modal.component.html
+++ b/client/src/app/shared/shared-support-modal/support-modal.component.html
@@ -8,7 +8,7 @@
 
   <div class="modal-footer inputs">
     <input
-      type="button" role="button" i18n-value value="Maybe later" class="action-button action-button-cancel"
+      type="button" role="button" i18n-value value="Maybe later" class="peertube-button grey-button"
       (click)="hide()" (key.enter)="hide()"
     >
   </div>
diff --git a/client/src/app/shared/shared-support-modal/support-modal.component.scss b/client/src/app/shared/shared-support-modal/support-modal.component.scss
deleted file mode 100644
index 184e09027..000000000
--- a/client/src/app/shared/shared-support-modal/support-modal.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.action-button-cancel {
-  margin-right: 0 !important;
-}
diff --git a/client/src/app/shared/shared-support-modal/support-modal.component.ts b/client/src/app/shared/shared-support-modal/support-modal.component.ts
index ae603c7a8..a0b9fada6 100644
--- a/client/src/app/shared/shared-support-modal/support-modal.component.ts
+++ b/client/src/app/shared/shared-support-modal/support-modal.component.ts
@@ -6,8 +6,7 @@ import { VideoChannel } from '@shared/models'
 
 @Component({
   selector: 'my-support-modal',
-  templateUrl: './support-modal.component.html',
-  styleUrls: [ './support-modal.component.scss' ]
+  templateUrl: './support-modal.component.html'
 })
 export class SupportModalComponent {
   @Input() video: VideoDetails = null
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html
index 57920239d..d6ee67ba9 100644
--- a/client/src/app/shared/shared-video-live/live-stream-information.component.html
+++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html
@@ -30,10 +30,7 @@
 
   <div class="modal-footer">
     <div class="form-group inputs">
-      <input
-        type="button" role="button" i18n-value value="Close" class="action-button action-button-cancel"
-        (click)="dismiss()"
-      >
+      <input type="button" role="button" i18n-value value="Close" class="peertube-button grey-button" (click)="dismiss()" />
 
       <my-edit-button
         i18n-label label="Update live settings"
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.html b/client/src/app/shared/shared-video-miniature/video-download.component.html
index 8a9218343..4ac74c106 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.html
@@ -4,10 +4,10 @@
       <ng-container i18n>Download</ng-container>
 
       <div *ngIf="videoCaptions" ngbDropdown class="d-inline-block ml-1">
-        <span id="dropdownDownloadType" ngbDropdownToggle>
+        <span id="dropdown-download-type" ngbDropdownToggle>
           {{ type }}
         </span>
-        <div ngbDropdownMenu aria-labelledby="dropdownDownloadType">
+        <div ngbDropdownMenu aria-labelledby="dropdown-download-type">
           <button *ngIf="type === 'video'" (click)="switchToType('subtitles')" ngbDropdownItem i18n>subtitles</button>
           <button *ngIf="type === 'subtitles'" (click)="switchToType('video')" ngbDropdownItem i18n>video</button>
         </div>
@@ -37,7 +37,7 @@
 
         <ng-container *ngFor="let file of getVideoFiles()" [ngbNavItem]="file.resolution.id">
           <a ngbNavLink i18n>{{ file.resolution.label }}</a>
-  
+
           <ng-template ngbNavContent>
             <div class="nav-content">
               <div class="input-group input-group-sm">
@@ -53,7 +53,7 @@
         </ng-container>
       </div>
       <div [ngbNavOutlet]="resolutionNav"></div>
-  
+
       <div class="advanced-filters collapse-transition" [ngbCollapse]="isAdvancedCustomizationCollapsed">
         <ng-container *ngIf="videoFile?.metadata">
           <div ngbNav #nav="ngbNav" class="nav-tabs nav-metadata">
@@ -67,7 +67,7 @@
                   </div>
                 </div>
               </ng-template>
-  
+
               <ng-container ngbNavItem [disabled]="videoFileMetadataVideoStream === undefined">
                 <a ngbNavLink i18n>Video stream</a>
                 <ng-template ngbNavContent>
@@ -79,7 +79,7 @@
                   </div>
                 </ng-template>
               </ng-container>
-  
+
               <ng-container ngbNavItem [disabled]="videoFileMetadataAudioStream === undefined">
                 <a ngbNavLink i18n>Audio stream</a>
                 <ng-template ngbNavContent>
@@ -91,7 +91,7 @@
                   </div>
                 </ng-template>
               </ng-container>
-  
+
             </ng-container>
           </div>
           <div [ngbNavOutlet]="nav"></div>
@@ -107,20 +107,20 @@
           </div>
         </ng-container>
       </div>
-  
+
       <div (click)="isAdvancedCustomizationCollapsed = !isAdvancedCustomizationCollapsed" role="button" class="advanced-filters-button"
       [attr.aria-expanded]="!isAdvancedCustomizationCollapsed" aria-controls="collapseBasic">
         <ng-container *ngIf="isAdvancedCustomizationCollapsed">
           <span class="glyphicon glyphicon-menu-down"></span>
-  
+
           <ng-container i18n>
             Advanced
           </ng-container>
         </ng-container>
-  
+
         <ng-container *ngIf="!isAdvancedCustomizationCollapsed">
           <span class="glyphicon glyphicon-menu-up"></span>
-  
+
           <ng-container i18n>
             Simple
           </ng-container>
@@ -131,13 +131,10 @@
 
   <div class="modal-footer inputs">
     <input
-      type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+      type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
       (click)="hide()" (key.enter)="hide()"
     >
 
-    <input
-      type="submit" i18n-value value="Download" class="action-button-submit"
-      (click)="download()"
-    >
+    <input type="submit" i18n-value value="Download" class="peertube-button orange-button" (click)="download()" />
   </div>
 </ng-template>
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.scss b/client/src/app/shared/shared-video-miniature/video-download.component.scss
index 199c3dac8..485db5ef5 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.scss
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.scss
@@ -17,7 +17,7 @@
   .nav-tabs {
     margin-top: 10x;
   }
-  
+
   .glyphicon {
     margin-right: 5px;
   }
@@ -46,7 +46,7 @@
   @include orange-button;
 }
 
-#dropdownDownloadType {
+#dropdown-download-type {
   cursor: pointer;
 }