From 052668fddc2827b87055e37b43516500a348f9d8 Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano@alfresco.com>
Date: Fri, 15 Jun 2018 14:59:59 +0100
Subject: [PATCH] [ADF-3212] Upload version buttons wrapping fixed (#3492)

---
 .../version-manager/version-upload.component.html      |  9 ++++-----
 .../version-manager/version-upload.component.scss      | 10 ++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/content-services/version-manager/version-upload.component.html b/lib/content-services/version-manager/version-upload.component.html
index b73a94b010..5b966eb995 100644
--- a/lib/content-services/version-manager/version-upload.component.html
+++ b/lib/content-services/version-manager/version-upload.component.html
@@ -15,13 +15,9 @@
     </mat-form-field>
 
 </div>
-<div>
-    <button mat-raised-button (click)="cancelUpload()" class="adf-cancel-button">{{
-        'ADF_VERSION_LIST.ACTIONS.UPLOAD.CANCEL'| translate }}
-    </button>
+<div class="adf-version-upload-buttons">
     <adf-upload-version-button
         data-automation-id="adf-new-version-file-upload"
-        class="adf-new-version-file-upload"
         staticTitle="{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.TITLE' | translate }}"
         [node]="node"
         [disabled]="!canUpload()"
@@ -33,5 +29,8 @@
         (success)="success.emit($event)"
         (error)="error.emit($event)">
     </adf-upload-version-button>
+    <button mat-raised-button (click)="cancelUpload()">{{
+        'ADF_VERSION_LIST.ACTIONS.UPLOAD.CANCEL'| translate }}
+    </button>
 </div>
 
diff --git a/lib/content-services/version-manager/version-upload.component.scss b/lib/content-services/version-manager/version-upload.component.scss
index 8756b46674..efb872d5c3 100644
--- a/lib/content-services/version-manager/version-upload.component.scss
+++ b/lib/content-services/version-manager/version-upload.component.scss
@@ -7,13 +7,11 @@
     margin: 5px;
 }
 
-.adf-cancel-button {
-    margin-left: 20px;
-    float: right;
-}
-
-.adf-new-version-file-upload {
+.adf-version-upload-buttons {
+    display: flex;
     float: right;
+    justify-content: space-between;
+    width: 100%;
 }
 
 .adf-new-version-max-width {