From b46d468f76ea48285aee2310a854e7debe9b655c Mon Sep 17 00:00:00 2001
From: AleksanderSklorz <115619721+AleksanderSklorz@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:53:15 +0100
Subject: [PATCH] [ACS-6212] Fix overlaping labels and incorrect color for
 warning (#9219)

---
 .../content-node-share.dialog.html            |  6 +++--
 .../content-node-share.dialog.scss            |  8 ++-----
 .../content-node-share.dialog.spec.ts         | 22 +++++++++++++++++++
 lib/core/src/lib/styles/_colors.scss          |  2 +-
 lib/core/src/lib/styles/_index.scss           |  1 +
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
index ba142b7403..d030ea6947 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
@@ -31,7 +31,7 @@
                     [style.display]="isExpiryDateToggleChecked ? 'block' : 'none'"
                     data-automation-id="adf-slide-toggle-checked"
                     class="adf-share-link__date-time-container">
-                    <mat-form-field class="adf-full-width adf-float-label">
+                    <mat-form-field class="adf-full-width" floatLabel="never" data-automation-id="adf-content-share-expiration-field">
                         <mat-label>{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}</mat-label>
                         <mat-datepicker-toggle
                             [disabled]="time.disabled"
@@ -73,7 +73,9 @@
                     </div>
                 </div>
                 <mat-form-field
-                    class="adf-full-width adf-float-label"
+                    class="adf-full-width"
+                    floatLabel="never"
+                    data-automation-id="adf-content-share-public-link-field"
                     [ngClass]="isLinkWithExpiryDate? 'adf-share-link__border-color' : ''">
                     <input
                         #sharedLinkInput
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
index abd4df9528..fe0346c62a 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
@@ -1,7 +1,3 @@
-.adf-float-label {
-    padding-top: 20px;
-}
-
 .adf-share-link-dialog {
     .adf-share-link {
         &__dialog-content {
@@ -41,7 +37,7 @@
         }
 
         &__warn {
-            color: var(--theme-warn-color);
+            color: var(--theme-warn-color-a700);
             font-size: var(--theme-caption-font-size);
         }
 
@@ -91,7 +87,7 @@
         }
 
         &__border-color {
-            border: 1px solid var(--theme-warn-color);
+            border: 1px solid var(--theme-warn-color-a700);
         }
     }
 
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
index 51fa1e1e08..6c1becd8f3 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
@@ -293,6 +293,28 @@ describe('ShareDialogComponent', () => {
         expect(fixture.nativeElement.querySelector('[data-automation-id="adf-slide-toggle-checked"]').style.display).toEqual('none');
     });
 
+    it('should not display floating label for expiration field', () => {
+        component.data = {
+            node,
+            baseShareUrl: 'some-url/'
+        };
+
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('[data-automation-id="adf-content-share-expiration-field"]'))
+            .componentInstance.floatLabel).toBe('never');
+    });
+
+    it('should not display floating label for public link field', () => {
+        component.data = {
+            node,
+            baseShareUrl: 'some-url/'
+        };
+
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('[data-automation-id="adf-content-share-public-link-field"]'))
+            .componentInstance.floatLabel).toBe('never');
+    });
+
     describe('datetimepicker type', () => {
         beforeEach(() => {
             spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of());
diff --git a/lib/core/src/lib/styles/_colors.scss b/lib/core/src/lib/styles/_colors.scss
index de5545c841..6e754a765d 100644
--- a/lib/core/src/lib/styles/_colors.scss
+++ b/lib/core/src/lib/styles/_colors.scss
@@ -153,7 +153,7 @@ $alfresco-warn: (
     A100: #ff8a80,
     A200: #ff5252,
     A400: #ff1744,
-    A700: #d50000,
+    A700: #c95100,
     contrast: (
         50: $black-87-opacity,
         100: $black-87-opacity,
diff --git a/lib/core/src/lib/styles/_index.scss b/lib/core/src/lib/styles/_index.scss
index ac5dc35201..3f329c4a73 100644
--- a/lib/core/src/lib/styles/_index.scss
+++ b/lib/core/src/lib/styles/_index.scss
@@ -37,6 +37,7 @@
         --adf-theme-primary-900:mat.get-color-from-palette($primary, 900),
 
         --theme-warn-color: mat.get-color-from-palette($warn),
+        --theme-warn-color-a700: mat.get-color-from-palette($warn, A700),
         --theme-warn-color-default-contrast: mat.get-color-from-palette($warn, default-contrast),
 
         --theme-accent-color: mat.get-color-from-palette($accent),