From c9cbb32c590af8243d3c592333e9d7d87dfb04c5 Mon Sep 17 00:00:00 2001
From: jacekpluta <73617938+jacekpluta@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:19:23 +0200
Subject: [PATCH] [ACS-7535][ACS-7537][ACS-7536][ACA] Move/Copy dialogs, Share
dialog, Aspects dialog (#9553)
---
.../aspect-list-dialog.component.scss | 8 ++--
.../aspect-list/aspect-list.component.scss | 6 ++-
...content-node-selector-panel.component.html | 7 ++-
...content-node-selector-panel.component.scss | 33 ++++++++++++-
.../content-node-selector.component.scss | 46 ++++++++++++++++++-
.../sites-dropdown.component.html | 2 +-
.../content-node-share.dialog.html | 4 +-
.../content-node-share.dialog.scss | 15 +++++-
.../content-node-share.dialog.spec.ts | 2 +-
lib/core/src/lib/styles/_mat-selectors.scss | 7 +++
10 files changed, 116 insertions(+), 14 deletions(-)
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
index 80fe1d91cb..d5c4fe65c2 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
@@ -2,7 +2,10 @@
adf-aspect-list-dialog {
display: block;
- padding: 24px 24px 8px;
+
+ #{$mat-expansion-panel-body} {
+ margin-top: -2px;
+ }
}
.adf {
@@ -20,7 +23,7 @@ adf-aspect-list-dialog {
&-aspect-list-dialog-information {
display: flex;
justify-content: space-between;
- padding-top: 10px;
+ padding-bottom: 4px;
padding-left: 4px;
padding-right: 4px;
font-size: small;
@@ -42,7 +45,6 @@ adf-aspect-list-dialog {
}
&-aspect-dialog-content {
- padding-top: 3px;
margin-bottom: 8px;
.adf-aspect-property-table {
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
index 5e003a892a..6779ef85e9 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
+++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss
@@ -46,7 +46,7 @@ $dialog-list-height: calc(65vh - ($dialog-title-height + $dialog-information-hei
&-header {
font-size: smaller;
- padding-left: 16px;
+ padding-left: 12px;
}
&-header-title {
@@ -77,14 +77,18 @@ $dialog-list-height: calc(65vh - ($dialog-title-height + $dialog-information-hei
.adf-aspect-property-table-column {
&-name {
width: 15%;
+ padding-left: 24px;
+ padding-right: 0;
}
&-title {
width: 65%;
+ padding: 0;
}
&-data-type {
width: 20%;
+ padding-right: 24px;
padding-left: 10px;
}
}
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
index a6e56b5177..575cde7b35 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
@@ -1,10 +1,13 @@
-
+
+ {{'NODE_SELECTOR.SEARCH' | translate}}
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
index 9f7277fe19..ff81c37754 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
@@ -1,3 +1,5 @@
+@import 'styles/mat-selectors';
+
/* stylelint-disable no-descending-specificity */
$content-node-selector-thumbnail-width: 35px !default;
$content-node-selector-thumbnail-max-width: 40px !default;
@@ -13,6 +15,13 @@ h2.adf-search-results-label {
color: var(--adf-theme-foreground-text-color-087);
}
+#{$mdc-dialog} {
+ #{$mat-dialog-surface}:is(div) {
+ padding-bottom: 0;
+ }
+}
+
+
.adf-content-node-selector-panel {
.adf-toolbar .adf-toolbar-container.adf-toolbar-container-row {
max-height: 48px;
@@ -28,6 +37,7 @@ h2.adf-search-results-label {
}
&-document-list-container {
+ margin-top: 16px;
width: 100%;
}
@@ -50,9 +60,22 @@ h2.adf-search-results-label {
.adf-site-dropdown-container {
display: block;
margin-bottom: 15px;
+
+ #{$mat-form-field-label} {
+ padding-top: 16px;
+ }
+
+ #{$mat-floating-label-above} {
+ padding-top: 0;
+ }
}
}
+ .adf-sites-dropdown-form-field {
+ margin-top: 4px;
+ margin-bottom: 16px;
+ }
+
.adf-site-dropdown-list-element {
width: 100%;
margin-bottom: 0;
@@ -84,6 +107,7 @@ h2.adf-search-results-label {
}
}
+ &-content-list,
&-list {
height: 40vh;
overflow: auto;
@@ -147,8 +171,7 @@ h2.adf-search-results-label {
.adf-datatable-body .adf-datatable-row {
min-height: 40px;
- @media screen and (-ms-high-contrast: active),
- screen and (-ms-high-contrast: none) {
+ @media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) {
padding-top: 15px;
}
@@ -166,6 +189,12 @@ h2.adf-search-results-label {
}
}
+ .adf-datatable-list {
+ .adf-name-location-cell-location {
+ display: none;
+ }
+ }
+
&-searchLayout {
.adf-datatable-list .adf-datatable-body .adf-datatable-row {
min-height: 65px;
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
index 9a725d8c65..44c1e755f2 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
@@ -1,3 +1,5 @@
+@import 'styles/mat-selectors';
+
adf-content-node-selector {
.adf-upload-dialog {
box-shadow: none;
@@ -40,7 +42,48 @@ adf-content-node-selector {
}
.adf-content-node-selector-dialog {
+ #{$mat-form-field} {
+ width: 100%;
+
+ #{$mat-select-arrow-wrapper} {
+ transform: translateY(2px);
+ padding-right: 4px;
+ }
+
+ #{$mat-form-field-infix} {
+ border-top: 0.85em solid transparent;
+ padding-bottom: 6px;
+ padding-top: 20px;
+ }
+
+ #{$mat-floating-label} {
+ padding-top: 8px;
+ }
+ }
+
+ .adf-content-node-selector-content-input-icon {
+ font-size: 21px;
+ padding: 18px 0 0 0;
+ margin-right: -4px;
+ }
+
+ .adf-dropdown-breadcrumb-icon {
+ color: var(--adf-theme-foreground-base-color-045);
+ }
+
+ #{$mat-dialog-title} {
+ margin-bottom: 0;
+ padding: 0;
+
+ &::before {
+ display: none
+ }
+ }
+
.adf-content-node-selector-dialog-title {
+ padding-bottom: 4px;
+ padding-left: 0;
+ padding-right: 0;
font-size: var(--theme-title-font-size);
font-weight: 600;
font-style: normal;
@@ -57,7 +100,8 @@ adf-content-node-selector {
.adf-content-node-selector-dialog-actions {
padding: 8px;
- height: 61px;
+ height: 77px;
+ background-color: var(--theme-background-color);
display: flex;
flex-direction: row;
justify-content: space-between;
diff --git a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
index 063037425a..dde05749f6 100644
--- a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
+++ b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
@@ -1,5 +1,5 @@
-
+
{{ 'NODE_SELECTOR.LOCATION' | translate }}
-
+
{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}
{
fixture.detectChanges();
expect(fixture.debugElement.query(By.css('[data-automation-id="adf-content-share-expiration-field"]')).componentInstance.floatLabel).toBe(
- 'always'
+ 'auto'
);
});
diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss
index be0ca8db47..a65f02777f 100644
--- a/lib/core/src/lib/styles/_mat-selectors.scss
+++ b/lib/core/src/lib/styles/_mat-selectors.scss
@@ -93,4 +93,11 @@ $mat-toolbar: '.mat-toolbar';
$mat-slide-toggle: '.mat-mdc-slide-toggle';
$mat-checkbox-background: '.mdc-checkbox__background';
$mat-dialog-content: '.mdc-dialog__content';
+$mat-floating-label: '.mdc-floating-label';
+$mat-floating-label-above: '.mdc-floating-label--float-above';
$mat-form-field-infix: '.mat-mdc-form-field-infix';
+$mat-select-arrow-wrapper: '.mat-mdc-select-arrow-wrapper';
+$mat-dialog-title: '.mdc-dialog__title';
+$mat-expansion-panel-body: '.mat-expansion-panel-body';
+$mat-dialog-surface: '.mat-mdc-dialog-surface';
+$mdc-dialog: '.mdc-dialog'