From 7b67c7cf3ad5b0a8558be3d5437682ff2d57e0be Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 24 Apr 2025 10:10:46 -0400 Subject: [PATCH] AAE-34458 Cleanup deprecated styles, bug fixes (#10819) --- lib/core/src/lib/styles/_colors.scss | 73 ------------------------ lib/core/src/lib/styles/_index.scss | 7 +-- lib/core/src/lib/styles/_theming.scss | 8 +-- lib/core/src/lib/styles/_typography.scss | 2 +- 4 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 lib/core/src/lib/styles/_colors.scss diff --git a/lib/core/src/lib/styles/_colors.scss b/lib/core/src/lib/styles/_colors.scss deleted file mode 100644 index 21d0a81d77..0000000000 --- a/lib/core/src/lib/styles/_colors.scss +++ /dev/null @@ -1,73 +0,0 @@ -/* stylelint-disable */ -// Accent color palette -$black-87-opacity: rgba(black, 0.87); -$white-87-opacity: rgba(white, 0.87); - -// [AAE-34457] TODO: move to the alfresco-applications: apps/admin-cc/src/custom-style.scss -$alfresco-warn: ( - 50: #ffebee, - 100: #ffcdd2, - 200: #ef9a9a, - 300: #e57373, - 400: #ef5350, - 500: #f44336, - 600: #e53935, - 700: #d32f2f, - 800: #c62828, - 900: #b71c1c, - A100: #ff8a80, - A200: #ff5252, - A400: #ff1744, - A700: #c95100, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: $black-87-opacity, - 400: $black-87-opacity, - 500: white, - 600: white, - 700: white, - 800: $white-87-opacity, - 900: $white-87-opacity, - A100: $black-87-opacity, - A200: white, - A400: white, - A700: white - ) -); - -// [AAE-34458] TODO: move to HxP: apps/admin-apa/src/custom-style.scss -$alfresco-accent-orange: ( - 50: #fff3e0, - 100: #ffe0b2, - 200: #ffcc80, - 300: #ffb74d, - 400: #ffa726, - 500: #ff9800, - 600: #fb8c00, - 700: #f57c00, - 800: #ef6c00, - 900: #e65100, - A100: #ffd180, - A200: #ffab40, - A400: #ff9100, - A700: #ff6d00, - contrast: ( - 50: $white-87-opacity, - 100: $white-87-opacity, - 200: $white-87-opacity, - 300: $white-87-opacity, - 400: $white-87-opacity, - 500: $white-87-opacity, - 600: $white-87-opacity, - 700: $white-87-opacity, - 800: white, - 900: white, - A100: $black-87-opacity, - A200: $black-87-opacity, - A400: $black-87-opacity, - A700: black - ) -); -/* stylelint-enable */ diff --git a/lib/core/src/lib/styles/_index.scss b/lib/core/src/lib/styles/_index.scss index 3519ab8b38..1ff04141a6 100644 --- a/lib/core/src/lib/styles/_index.scss +++ b/lib/core/src/lib/styles/_index.scss @@ -1,16 +1,15 @@ /* stylelint-disable value-keyword-case */ @use '@angular/material' as mat; +@use '@mat-datetimepicker/core/datetimepicker/datetimepicker-theme'; /* stylelint-disable value-list-max-empty-lines */ /* stylelint-disable scss/no-global-function-names */ /* stylelint-disable scss/at-import-partial-extension */ -@import '../styles/colors'; -@import '../styles/mixins'; -@import '../styles/mat-selectors'; +@import './mixins'; +@import './mat-selectors'; @import '../form/components/widgets/form.theme'; @import '../clipboard/clipboard.theme'; @import './snackbar.theme'; @import './material.theme'; -@import '../../../../../node_modules/@mat-datetimepicker/core/datetimepicker/datetimepicker-theme'; @mixin alfresco-material-theme($theme) { @include adf-core-theme($theme); diff --git a/lib/core/src/lib/styles/_theming.scss b/lib/core/src/lib/styles/_theming.scss index 72ce1944c4..2e5834d7f8 100644 --- a/lib/core/src/lib/styles/_theming.scss +++ b/lib/core/src/lib/styles/_theming.scss @@ -1,5 +1,3 @@ -@import '../styles/colors'; -@import '../styles/mixins'; -@import '../styles/typography'; -@import '../styles/mat-selectors'; - +@import './mixins'; +@import './typography'; +@import './mat-selectors'; diff --git a/lib/core/src/lib/styles/_typography.scss b/lib/core/src/lib/styles/_typography.scss index 5a8c11b494..0c9e0bcd26 100644 --- a/lib/core/src/lib/styles/_typography.scss +++ b/lib/core/src/lib/styles/_typography.scss @@ -1,7 +1,7 @@ @use '@angular/material' as mat; $alfresco-typography: mat.define-typography-config( - $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', + $font-family: 'Roboto, "Helvetica Neue", sans-serif', $headline-1: mat.define-typography-level(112px, 112px, 300), $headline-2: mat.define-typography-level(56px, 56px, 400), $headline-3: mat.define-typography-level(45px, 48px, 400),