From 3b6e7e87a2216c1306e7672f738c70893c2296cc Mon Sep 17 00:00:00 2001 From: jacekpluta <73617938+jacekpluta@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:45:12 +0200 Subject: [PATCH] [ACS-7331] - View details sidebar (#9455) --- .../categories-management.component.scss | 6 +- .../content-metadata.component.scss | 25 +++++++- .../card-view-dateitem.component.scss | 11 +++- .../card-view-selectitem.component.scss | 22 ++++++- .../card-view-textitem.component.html | 10 ++-- .../card-view-textitem.component.scss | 13 +++-- .../card-view/card-view.component.scss | 18 ++++-- .../src/lib/comments/comments.component.html | 4 +- .../src/lib/comments/comments.component.scss | 38 ++++++++----- .../info-drawer-layout.component.scss | 6 ++ .../info-drawer/info-drawer.component.scss | 57 ++++++++++--------- lib/core/src/lib/styles/_mat-selectors.scss | 5 +- 12 files changed, 147 insertions(+), 68 deletions(-) diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss index 32288cdf3a..8d44a50b99 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss @@ -1,6 +1,4 @@ .adf-categories-management { - padding-top: 12px; - .adf-category-name-field { justify-content: space-between; width: 100%; @@ -11,7 +9,9 @@ align-items: center; input { - padding: 7px 8px; + background-color: transparent; + padding: 7px 8px 8px 8px; + width: 100%; } } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss index 9c26d77dca..f71648c933 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss @@ -1,3 +1,5 @@ +@import 'styles/mat-selectors'; + $panel-properties-height: 56px !default; .adf { @@ -10,7 +12,12 @@ $panel-properties-height: 56px !default; .adf-property-list .adf-property .adf-property-field { .adf-property-value:not(.adf-card-view-selectitem .adf-property-value) { - margin-top: 20px; + margin-top: 10px; + height: 32px; + + &:is(textarea) { + padding-top: 6px; + } } label { @@ -30,6 +37,19 @@ $panel-properties-height: 56px !default; } } + #{$mat-expansion-panel-body} { + padding-top: 16px; + + input { + border-color: transparent; + width: 100%; + + &:focus-visible { + outline: none; + } + } + } + .adf-edit-icon-buttons { color: var(--adf-theme-foreground-text-color-054); } @@ -41,7 +61,6 @@ $panel-properties-height: 56px !default; border-radius: 16px; width: fit-content; background: var(--adf-metadata-buttons-background-color); - margin-top: 12px; padding: 6px 12px; justify-content: center; margin-left: 8px; @@ -51,7 +70,7 @@ $panel-properties-height: 56px !default; .adf-metadata-no-item-added { word-break: break-all; font-size: 15px; - padding: 16px 0 0 12px; + padding: 0 0 0 12px; } &-tags { diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss index de7b0680c0..94b09fc6ce 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.scss @@ -2,18 +2,23 @@ .adf-card-view-dateitem { .adf-property-value { - padding: 6px 0; + padding-top: 6px; + padding-bottom: 6px; line-height: 20px; - border-bottom: 1px solid var(--adf-metadata-property-panel-border-color); color: var(--adf-metadata-property-panel-title-color); + border-bottom: 1px solid var(--adf-metadata-property-panel-border-color); + margin-top: 10px; &.adf-property-value-editable { + display: flex; + align-items: center; border-radius: 6px; border-bottom: inherit; + margin-bottom: 18px; } &.adf-property-readonly-value { - padding-left: 12px; + padding: 0 0 0 12px; } } diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss index 37e524040e..0c53a6f047 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss @@ -14,10 +14,20 @@ z-index: 1; } - .adf-property-value-editable { + .adf-property-value-editable.adf-property-value-editable { + padding-left: 0; + + #{$mat-text-field--no-label} #{$mat-form-field-infix} { + padding: 0; + } + + #{$mat-form-field-wrapper} { + background-color: initial; + } + /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ mat-select { - padding: 6px 0 6px 12px; + padding: 6px 0 8px 12px; margin-top: 0; border-radius: 6px; @@ -27,12 +37,20 @@ } } + #{$mat-form-field-subscript-wrapper} { + display: none; + } + .adf-property-read-only { padding: 6px 0; border-bottom: 1px solid var(--adf-metadata-property-panel-border-color); color: var(--adf-metadata-property-panel-title-color); } + .mdc-line-ripple { + display: none; + } + .adf-property-readonly-value { color: var(--adf-metadata-property-panel-label-color); } diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html index 38334f0974..574a5a6943 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html @@ -1,6 +1,6 @@
- - + {{ property.label | translate }} diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss index e61f87223d..de645e8546 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss @@ -1,10 +1,6 @@ @import 'styles/mat-selectors'; .adf-card-view-textitem { - .adf-property-field { - padding-top: 15px; - } - .adf-textitem-error { font-size: var(--theme-caption-font-size); padding-top: 6px; @@ -59,7 +55,7 @@ color: var(--adf-theme-foreground-text-color-054); } - .adf-property-read-only { + .adf-property-read-only:not(:has(.adf-property-readonly-value)) { border-bottom: 1px solid var(--adf-metadata-property-panel-border-color); } @@ -70,4 +66,11 @@ .adf-property-value-editable { color: var(--adf-metadata-property-panel-title-color); } + + #{$mat-form-field-underline} { + &::before, + &::after { + display: none; + } + } } diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss index 790648b969..f5c463f67b 100644 --- a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss +++ b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss @@ -22,10 +22,16 @@ } .adf-property-container { - margin-bottom: 10px; + margin-bottom: 12px; } .adf-property { + .adf-card-view-textitem { + .adf-property-field { + padding-top: 0; + } + } + .adf-property-field { width: 100%; @@ -49,7 +55,6 @@ #{$mat-form--text-field-infix} { border-top-width: 0; - padding: 0; } #{$mat-form-field-flex} { @@ -57,7 +62,10 @@ } #{$mat-form-field-wrapper} { + background-color: inherit; padding-bottom: 0; + padding-left: 0; + padding-right: 0; } #{$mat-form-field-label} { @@ -75,16 +83,18 @@ } .adf-property-value { - color: var(--adf-metadata-property-panel-text-color); + color: var(--adf-metadata-property-panel-title-color); &.adf-property-value-editable { color: var(--adf-metadata-property-panel-title-color); background-color: var(--adf-metadata-buttons-background-color); border-radius: 6px; + height: 32px; + padding-left: 10px; #{$mat-input-element} { color: var(--adf-metadata-action-button-clear-color); - padding: 6px 0 6px 12px; + padding: 5px 0 6px 12px; margin: 5px 0 0; } } diff --git a/lib/core/src/lib/comments/comments.component.html b/lib/core/src/lib/comments/comments.component.html index 45664daa7c..e058a3429d 100644 --- a/lib/core/src/lib/comments/comments.component.html +++ b/lib/core/src/lib/comments/comments.component.html @@ -3,12 +3,12 @@ {{'COMMENTS.HEADER' | translate: { count: comments?.length } }}
- + + {{'COMMENTS.ADD' | translate}}