From cbe93ba089ca05789b56f27aa0dda29f84500fcb Mon Sep 17 00:00:00 2001
From: jacekpluta <73617938+jacekpluta@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:17:35 +0200
Subject: [PATCH] [ACS-7542] - Upload new version dialog (#9572)

* [ACS-7542] - Upload new version dialog

* [ACS-7542] - Upload new version dialog
---
 .../new-version-uploader.dialog.scss          |  2 +-
 .../components/upload-button.component.html   |  2 +-
 .../components/upload-button.component.scss   | 13 +++++++--
 .../version-upload.component.html             |  6 ++--
 .../version-upload.component.scss             | 28 +++++++++++++++----
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
index b62829d075..6ff56fa17c 100644
--- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
+++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
@@ -37,7 +37,7 @@
     }
 
     .adf-new-version-uploader-dialog-content {
-        padding: 0;
+        padding: 1px 2px 0 2px;
         flex: 1 1 auto;
         position: relative;
         max-height: 100vh;
diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.html b/lib/content-services/src/lib/upload/components/upload-button.component.html
index ec81c9801b..402a9fc772 100644
--- a/lib/content-services/src/lib/upload/components/upload-button.component.html
+++ b/lib/content-services/src/lib/upload/components/upload-button.component.html
@@ -7,7 +7,7 @@
             [disabled]="isButtonDisabled()"
             mat-raised-button
             (click)="uploadSingleFile.click()">
-            <mat-icon>file_upload</mat-icon>
+            <mat-icon class="adf-upload-button-icon">file_upload</mat-icon>
             <span id="upload-single-file-label"
                 *ngIf="!staticTitle">{{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span>
             <span id="upload-single-file-label-static"
diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.scss b/lib/content-services/src/lib/upload/components/upload-button.component.scss
index 402c618aa3..5e52e93450 100644
--- a/lib/content-services/src/lib/upload/components/upload-button.component.scss
+++ b/lib/content-services/src/lib/upload/components/upload-button.component.scss
@@ -1,5 +1,14 @@
 .adf {
-    &-upload-button-file-container input {
-        display: none;
+    &-upload-button-file-container {
+        .adf-upload-button-icon {
+            margin: 0;
+            font-size: 24px;
+            width: 24px;
+            height: 24px;
+        }
+
+        input {
+            display: none;
+        }
     }
 }
diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.html b/lib/content-services/src/lib/version-manager/version-upload.component.html
index bffba2fd88..0f7118f4a4 100644
--- a/lib/content-services/src/lib/version-manager/version-upload.component.html
+++ b/lib/content-services/src/lib/version-manager/version-upload.component.html
@@ -7,10 +7,10 @@
             {{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.MAJOR' | translate: { version: majorVersion } }}
         </mat-radio-button>
     </mat-radio-group>
-    <mat-form-field class="adf-new-version-max-width">
+    <mat-form-field class="adf-new-version-max-width" subscriptSizing="dynamic">
+                    <mat-label>{{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}}</mat-label>
                     <textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area" id="adf-new-version-text-area"
-                              (change)="onCommentChange()"
-                              placeholder="{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate }}"></textarea>
+                              (change)="onCommentChange()"></textarea>
     </mat-form-field>
 
 </div>
diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.scss b/lib/content-services/src/lib/version-manager/version-upload.component.scss
index 424ba1ced7..30698f6150 100644
--- a/lib/content-services/src/lib/version-manager/version-upload.component.scss
+++ b/lib/content-services/src/lib/version-manager/version-upload.component.scss
@@ -1,3 +1,5 @@
+@import 'styles/mat-selectors';
+
 .adf-new-version-radio-group {
     display: inline-flex;
     flex-direction: column;
@@ -5,20 +7,36 @@
 
 .adf-new-version-radio-button {
     margin: 5px;
+    margin-top: 2px;
+    margin-left: 5px;
 }
 
 .adf-version-upload-buttons {
+    padding-top: 18px;
+    padding-bottom: 5px;
     display: flex;
     float: right;
     justify-content: space-between;
     width: 100%;
 }
 
-.adf-new-version-max-width {
-    width: 100%;
-    float: right;
+.adf-version-upload {
+    .adf-new-version-max-width {
+        padding-top: 2px;
+        width: 100%;
+        float: right;
 
-    .adf-new-version-text-area {
-        resize: none;
+        #{$mat-floating-label} {
+            padding-bottom: 10px;
+        }
+
+        #{$mat-form-field-infix} {
+            padding-top: 12px;
+            padding-bottom: 0;
+        }
+
+        .adf-new-version-text-area {
+            resize: none;
+        }
     }
 }