From 1111df1232811d29c58a8e98b89ae639549ca9f6 Mon Sep 17 00:00:00 2001 From: jacekpluta <73617938+jacekpluta@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:24:25 +0200 Subject: [PATCH] [ACS-7452] - Small screen notification banner [ACS-7418] About page (#9507) --- .../about-package/package-list.component.scss | 8 -------- .../about-repository-info.component.scss | 3 +++ .../about-repository-info.component.ts | 1 + .../about-server-settings.component.scss | 12 ++++++++++++ .../src/lib/styles/_components-variables.scss | 17 +++-------------- 5 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 lib/core/src/lib/about/about-repository-info/about-repository-info.component.scss diff --git a/lib/core/src/lib/about/about-package/package-list.component.scss b/lib/core/src/lib/about/about-package/package-list.component.scss index faec786e2ef..5e739f14286 100644 --- a/lib/core/src/lib/about/about-package/package-list.component.scss +++ b/lib/core/src/lib/about/about-package/package-list.component.scss @@ -2,10 +2,6 @@ background: var(--adf-package-list-table-background); &__header-row { - border-bottom-color: var(--adf-package-list-table-header-border-bottom-color); - border-style: var(--adf-package-list-table-header-border-style); - border-width: var(--adf-package-list-table-header-border-width); - border-bottom-width: var(--adf-package-list-table-header-border-bottom-width); min-height: var(--adf-package-list-table-header-min-height); } @@ -14,10 +10,6 @@ } &__row { - border-bottom-color: var(--adf-package-list-table-row-border-bottom-color); - border-style: var(--adf-package-list-table-row-border-style); - border-width: var(--adf-package-list-table-row-border-width); - border-bottom-width: var(--adf-package-list-table-row-border-bottom-width); min-height: var(--adf-package-list-table-row-min-height); &-cell { diff --git a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.scss b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.scss new file mode 100644 index 00000000000..75ce278e6cc --- /dev/null +++ b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.scss @@ -0,0 +1,3 @@ +article { + margin-top: 16px; +} diff --git a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts index 9b30d99777a..870b579f3b9 100644 --- a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts +++ b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts @@ -28,6 +28,7 @@ import { AboutStatusListComponent } from '../about-status-list/about-status-list @Component({ selector: 'adf-about-repository-info', templateUrl: './about-repository-info.component.html', + styleUrls: ['./about-repository-info.component.scss'], encapsulation: ViewEncapsulation.None, standalone: true, imports: [CommonModule, TranslateModule, AboutLicenseListComponent, ModuleListComponent, AboutStatusListComponent] diff --git a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.scss b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.scss index c792989e007..8094fbd0276 100644 --- a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.scss +++ b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.scss @@ -4,5 +4,17 @@ color: var(--adf-about-server-settings-color); border-radius: var(--adf-about-server-settings-border-radius); padding: var(--adf-about-server-settings-padding); + + &:has(p) { + border: none; + + p { + margin: 0 0 10px 0; + + &:last-child { + margin: 0; + } + } + } } } diff --git a/lib/core/src/lib/styles/_components-variables.scss b/lib/core/src/lib/styles/_components-variables.scss index 11068ccee8f..06e7cc9ec54 100644 --- a/lib/core/src/lib/styles/_components-variables.scss +++ b/lib/core/src/lib/styles/_components-variables.scss @@ -36,16 +36,8 @@ --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: mat.get-color-from-palette($background, card), - --adf-package-list-table-header-border-bottom-color: mat.get-color-from-palette($foreground, divider), - --adf-package-list-table-header-border-style: $adf-ref-table-header-border-style, - --adf-package-list-table-header-border-bottom-width: $adf-ref-table-header-border-bottom-width, - --adf-package-list-table-header-border-width: $adf-ref-table-header-border-width, --adf-package-list-table-header-min-height: $adf-ref-table-header-min-height, --adf-package-list-table-header-cell-color: mat.get-color-from-palette($foreground, secondary-text), - --adf-package-list-table-row-border-bottom-color: mat.get-color-from-palette($foreground, dividers), - --adf-package-list-table-row-border-style: $adf-ref-table-row-border-style, - --adf-package-list-table-row-border-bottom-width: $adf-ref-table-row-border-bottom-width, - --adf-package-list-table-row-border-width: $adf-ref-table-row-border-width, --adf-package-list-table-row-min-height: $adf-ref-table-row-min-height, --adf-package-list-table-row-cell-color: mat.get-color-from-palette($foreground, text), --adf-identity-user-info-background: var(--adf-theme-primary-300), @@ -56,10 +48,10 @@ --adf-user-info-container-margin-right: $adf-ref-margin-right, --adf-info-drawer-tab-default-color: mat.get-color-from-palette($accent), --adf-info-drawer-tab-default-background: mat.get-color-from-palette($background, card), - --adf-info-drawer-tab-default-bottom-line:$adf-ref-tab-bottom-line-default, - --adf-info-drawer-tab-hover-color:mat.get-color-from-palette($accent), + --adf-info-drawer-tab-default-bottom-line: $adf-ref-tab-bottom-line-default, + --adf-info-drawer-tab-hover-color: mat.get-color-from-palette($accent), --adf-info-drawer-tab-hover-background: mat.get-color-from-palette($background, card), - --adf-info-drawer-tab-hover-bottom-line:$adf-ref-tab-bottom-line-default, + --adf-info-drawer-tab-hover-bottom-line: $adf-ref-tab-bottom-line-default, --adf-info-drawer-tab-active-unfocused-color: mat.get-color-from-palette($primary), --adf-info-drawer-tab-active-unfocused-background: mat.get-color-from-palette($background, card), --adf-info-drawer-tab-active-unfocused-bottom-line: $adf-ref-tab-bottom-line-default, @@ -72,7 +64,6 @@ --adf-people-cloud-autosuggest-result-active-color: mat.get-color-from-palette($foreground, text), --adf-people-cloud-autosuggest-result-disabled-color: mat.get-color-from-palette($foreground, secondary-text), --adf-people-cloud-input-caption-error-color: mat.get-color-from-palette($warn), - --adf-metadata-property-panel-border-color: $adf-ref-metadata-property-panel-border-color, --adf-metadata-buttons-background-color: $adf-ref-metadata-buttons-background-color, --adf-metadata-action-button-clear-color: $adf-ref-metadata-action-button-clear-color, @@ -85,12 +76,10 @@ --adf-group-cloud-autosuggest-result-active-color: mat.get-color-from-palette($foreground, text), --adf-group-cloud-autosuggest-result-disabled-color: mat.get-color-from-palette($foreground, secondary-text), --adf-group-cloud-input-caption-error-color: mat.get-color-from-palette($warn), - --adf-task-assignment-filter-option-default-color: mat.get-color-from-palette($foreground, text), --adf-task-assignment-filter-option-selected-color: mat.get-color-from-palette($primary), --adf-task-assignment-filter-label-default-color: mat.get-color-from-palette($foreground, secondary-text), --adf-task-assignment-filter-label-focus-color: mat.get-color-from-palette($primary), - --adf-process-header-cloud-card-background: mat.get-color-from-palette($background, card), --adf-header-icon-button-default-color: $adf-ref-header-icon-color, --adf-header-icon-button-default-border-radius: $adf-ref-header-icon-border-radius,