From ac3d95936484a9eed3e3f93a9099be2fa10144d1 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Wed, 28 Jun 2023 15:49:01 +0100 Subject: [PATCH] [AAE-15480] - fixed variables name and added mat card variable (#8713) * [AAE-15480] - fixed variables name and added mat card variable * [AAE-15480] - updated variable names --- .../card-view-arrayitem.component.scss | 4 ++++ .../src/lib/styles/_components-variables.scss | 18 +++++++++++------- .../src/lib/styles/_reference-variables.scss | 14 +++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss index 0c7e66a54a..cce9156ff6 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss @@ -40,6 +40,10 @@ display: flex; place-content: center space-between; align-items: center; + background: var(--adf-card-view-array-item-background); + border: var(--adf-card-view-array-item-border); + border-color: var(--adf-card-view-array-item-border-color); + border-radius: var(--adf-card-view-array-item-border-radius); .mat-chip:hover { cursor: pointer; diff --git a/lib/core/src/lib/styles/_components-variables.scss b/lib/core/src/lib/styles/_components-variables.scss index e1dcf64548..4f99fded8e 100644 --- a/lib/core/src/lib/styles/_components-variables.scss +++ b/lib/core/src/lib/styles/_components-variables.scss @@ -5,7 +5,11 @@ --adf-card-view-background: $adf-ref-card-background, --adf-card-view-border: $adf-ref-card-border, --adf-card-view-border-color: $adf-ref-card-border-color, - --adf-card-view-border-radius: $adf-ref-card-border-radius-0, + --adf-card-view-border-radius: $adf-ref-card-border-radius-slim, + --adf-card-view-array-item-background: $adf-ref-card-background, + --adf-card-view-array-item-border: $adf-ref-card-border, + --adf-card-view-array-item-border-color: $adf-ref-card-border-color, + --adf-card-view-array-item-border-radius: $adf-ref-card-border-radius-slim, --adf-edit-task-and-service-filter-header-title-color: $adf-ref-title-color, --adf-edit-task-and-service-filter-header-description-color: $adf-ref-description-color, --adf-edit-task-and-service-filter-content-text-label-color: $adf-ref-text-field-label-color, @@ -20,8 +24,8 @@ --adf-edit-process-filter-content-select-label-color: $adf-ref-select-field-label-color, --adf-about-server-settings-background: $adf-ref-card-background, --adf-about-server-settings-color: $adf-ref-card-color, - --adf-about-server-settings-border-radius: $adf-ref-card-border-radius-4, - --adf-about-server-settings-padding: $adf-ref-card-padding-16, + --adf-about-server-settings-border-radius: $adf-ref-card-border-radius-normal, + --adf-about-server-settings-padding: $adf-ref-card-padding, --adf-package-list-table-background: $adf-ref-table-background, --adf-package-list-table-header-border-bottom-color: $adf-ref-table-header-border-bottom-color, --adf-package-list-table-header-border-style: $adf-ref-table-header-border-style, @@ -36,11 +40,11 @@ --adf-package-list-table-row-min-height: $adf-ref-table-row-min-height, --adf-package-list-table-row-cell-color: $adf-ref-table-row-cell-color, --adf-identity-user-info-background: var(--adf-theme-primary-300), - --adf-identity-user-info-height: $adf-ref-height-40, - --adf-identity-user-info-width: $adf-ref-width-40, - --adf-identity-user-info-line-height: $adf-ref-line-height-40, + --adf-identity-user-info-height: $adf-ref-height, + --adf-identity-user-info-width: $adf-ref-width, + --adf-identity-user-info-line-height: $adf-ref-line-height, --adf-identity-user-info-font-size: var(--theme-adf-picture-1-font-size), - --adf-user-info-container-margin-right: $adf-ref-margin-right-8, + --adf-user-info-container-margin-right: $adf-ref-margin-right, ); // propagates SCSS variables into the CSS variables scope diff --git a/lib/core/src/lib/styles/_reference-variables.scss b/lib/core/src/lib/styles/_reference-variables.scss index b054a6c26a..d214c5fff0 100644 --- a/lib/core/src/lib/styles/_reference-variables.scss +++ b/lib/core/src/lib/styles/_reference-variables.scss @@ -1,15 +1,15 @@ $adf-ref-card-background: white; $adf-ref-card-border: unset; $adf-ref-card-border-color: unset; -$adf-ref-card-border-radius-0: 0; +$adf-ref-card-border-radius-slim: 0; $adf-ref-height-48: 48px; $adf-ref-title-color: rgba(0, 0, 0, 0.87); $adf-ref-description-color: rgba(0, 0, 0, 0.54); $adf-ref-text-field-label-color: rgba(0, 0, 0, 0.54); $adf-ref-select-field-label-color: rgba(0, 0, 0, 0.54); $adf-ref-card-color: rgba(0, 0, 0, 0.87); -$adf-ref-card-padding-16: 16px; -$adf-ref-card-border-radius-4: 4px; +$adf-ref-card-padding: 16px; +$adf-ref-card-border-radius-normal: 4px; $adf-ref-table-background: white; $adf-ref-table-header-border-bottom-color: rgba(0, 0, 0, 0.12); $adf-ref-table-header-border-style: solid; @@ -23,7 +23,7 @@ $adf-ref-table-row-border-bottom-width: 1px; $adf-ref-table-row-border-width: 0; $adf-ref-table-row-min-height: 48px; $adf-ref-table-row-cell-color: rgba(0, 0, 0, 0.87); -$adf-ref-height-40: 40px; -$adf-ref-width-40: 40px; -$adf-ref-line-height-40: 40px; -$adf-ref-margin-right-8: 8px; +$adf-ref-height: 40px; +$adf-ref-width: 40px; +$adf-ref-line-height: 40px; +$adf-ref-margin-right: 8px;