From 4dfcd7bff149edcbf649a216e55e6546d3cd8128 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Mon, 4 Dec 2023 16:39:38 +0000 Subject: [PATCH] Fixing styles not migrated by material --- .../categories-management.component.scss | 10 +++---- ...content-node-selector-panel.component.scss | 6 ++-- .../content-node-share.dialog.scss | 23 ++------------ .../content-user-info.component.scss | 6 ++-- .../src/lib/dialogs/confirm.dialog.scss | 3 +- .../download-zip/download-zip.dialog.scss | 3 +- .../src/lib/dialogs/folder.dialog.scss | 9 ++---- .../new-version-uploader.dialog.scss | 7 ----- .../add-permission-dialog.component.scss | 3 +- .../permission-list.component.scss | 3 +- .../search-check-list.component.scss | 6 ++-- ...rch-chip-autocomplete-input.component.scss | 18 ++++------- .../search-chip-list.component.scss | 3 +- .../search-facet-field.component.scss | 29 ++++-------------- .../search-facet-chip-tabbed.component.scss | 1 - .../search-filter-chips.component.scss | 3 +- .../search-filter-tabbed.component.scss | 14 ++------- .../search-filter.component.scss | 5 ++-- .../search-form/search-form.component.scss | 3 +- .../search-properties.component.scss | 30 +++++-------------- .../search-radio/search-radio.component.scss | 6 ++-- .../card-view/card-view.component.scss | 3 +- .../datatable/datatable.component.scss | 2 +- .../components/form-renderer.component.scss | 8 ++--- .../inplace-form-input.component.scss | 2 +- .../widgets/date-time/date-time.widget.scss | 6 ++-- .../form/components/widgets/form.theme.scss | 2 +- .../identity-user-info.component.scss | 10 +++---- .../info-drawer-layout.component.scss | 9 +++--- .../info-drawer/info-drawer.component.scss | 4 +-- .../lib/login/components/login.component.scss | 20 +++++-------- .../search-text-input.component.scss | 2 +- .../attach-file-cloud-widget.component.scss | 2 +- .../widgets/date/date-cloud.widget.scss | 6 ++-- .../components/task-form-cloud.component.scss | 2 +- .../src/lib/form/start-form.component.scss | 8 ++--- .../attach-file-widget.component.scss | 6 ++-- .../process-user-info.component.scss | 4 +-- .../components/start-task.component.scss | 2 +- .../components/task-details.component.scss | 2 +- .../task-form/task-form.component.scss | 2 +- .../components/task-standalone.component.scss | 2 +- stylelint-config.json | 2 +- 43 files changed, 97 insertions(+), 200 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 98bbb7d53b..b055398561 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 @@ -47,18 +47,16 @@ padding: 5px 0; font-size: 14px; - /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - &.mat-list-item-disabled { + &.mdc-list-item--disabled { background-color: inherit; color: inherit; } - /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - .mat-list-item-content, - .mat-list-item-content-reverse { + .mdc-list-item__content, + .mdc-list-item__content-reverse { padding: 0; - .mat-pseudo-checkbox { + .mdc-checkbox { display: none; } } diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss index 2324075709..9ed2c45502 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss @@ -48,8 +48,7 @@ h2.adf-search-results-label { } } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-underline .mat-form-field-ripple { + .mdc-line-ripple { height: 1px; transition: none; } @@ -65,8 +64,7 @@ h2.adf-search-results-label { width: 100%; margin-bottom: 0; - /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ - .mat-select-trigger { + .mat-mdc-select-trigger { font-size: var(--theme-body-1-font-size); } } diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss index 753c6daf23..386803d00f 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss @@ -110,8 +110,7 @@ margin-left: 8px; } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { border-top: unset; } @@ -127,8 +126,7 @@ } } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-flex { + .mat-mdc-form-field-flex { align-items: center; } @@ -136,18 +134,6 @@ padding: 0; } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-appearance-legacy .mat-form-field-underline { - display: none; - } - - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-appearance-legacy .mat-form-field-wrapper { - padding-bottom: 8px; - margin-right: 8px; - margin-left: 8px; - } - @media screen and (max-width: 380px) { .mat-mdc-dialog-container { padding: 0 15px; @@ -157,10 +143,5 @@ margin-bottom: 0; padding: 2px 0; } - - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { - padding-left: 8px; - } } } diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.scss b/lib/content-services/src/lib/content-user-info/content-user-info.component.scss index 0454adf009..92ff9a2b67 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.scss +++ b/lib/content-services/src/lib/content-user-info/content-user-info.component.scss @@ -63,8 +63,7 @@ min-width: 250px; } - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-userinfo-tab .mat-tab-label { + &-userinfo-tab .mdc-tab__text-label { flex: auto; font-weight: 500; font-size: var(--theme-body-1-font-size); @@ -148,8 +147,7 @@ text-align: left; } - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-hide-tab .mat-tab-label-active { + &-hide-tab .mdc-tab-indicator--active { display: none !important; } } diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.scss b/lib/content-services/src/lib/dialogs/confirm.dialog.scss index f88b23c0e9..59ff31fb19 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.scss +++ b/lib/content-services/src/lib/dialogs/confirm.dialog.scss @@ -2,7 +2,6 @@ flex: 1 1 auto; } -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -.adf-confirm-dialog .mat-dialog-actions .mat-button-wrapper { +.adf-confirm-dialog .mat-mdc-dialog-actions .mdc-button__label { text-transform: uppercase; } diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss index 7ef9b45e22..8d9685c087 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.scss @@ -1,4 +1,3 @@ -/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ -.adf-download-zip-dialog .mat-dialog-actions .mat-button-wrapper { +.adf-download-zip-dialog .mat-mdc-dialog-actions .mdc-button__label { text-transform: uppercase; } diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.scss b/lib/content-services/src/lib/dialogs/folder.dialog.scss index 8a4739acb3..a5ab1a3db6 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.scss +++ b/lib/content-services/src/lib/dialogs/folder.dialog.scss @@ -7,19 +7,16 @@ } .adf-lock-file-name { - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-layout { + .mat-mdc-checkbox { width: 100%; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-label { + .mat-mdc-checkbox label { text-overflow: ellipsis; overflow: hidden; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-inner-container { + .mdc-checkbox { margin: auto 8px auto 0; } } diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss index 081e007112..9a86957e01 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss @@ -60,13 +60,6 @@ } } - /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. - */ - .mat-list-item-content { - padding: 0; - margin: 0 16px; - } - .adf-version-list-container { .adf-version-list { height: 250px; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss index 63fe6bfb77..cae60643a8 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss @@ -58,8 +58,7 @@ &-search-user-button { width: 100%; - /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - .mat-button-wrapper { + .mdc-button__label { display: flex; align-items: center; } diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss index 1858a484b7..ea556f5be8 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss @@ -51,8 +51,7 @@ position: relative; height: 40px; - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { border: none; } } diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss index d27af370da..83c93acd97 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.scss @@ -7,15 +7,13 @@ display: block; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-label { + .mat-mdc-checkbox label { text-overflow: ellipsis; overflow: hidden; width: 100%; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-layout { + .mat-mdc-checkbox { width: 100%; } diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss index d775400a2e..a9d97bd42f 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss @@ -3,13 +3,11 @@ adf-search-chip-autocomplete-input { width: 100%; } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-appearance-outline .mat-form-field-outline { + .mat-form-field-appearance-outline .mdc-text-field--outlined { top: 0; } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { border: none; } @@ -21,8 +19,7 @@ adf-search-chip-autocomplete-input { word-break: break-word; } - /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ - .mat-chip-remove.adf-option-chips-delete-button { + .mat-mdc-chip-remove.adf-option-chips-delete-button { font-size: 13px; height: 13px; width: 13px; @@ -34,19 +31,16 @@ adf-search-chip-autocomplete-input { } } - /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ - .mat-chip-list-wrapper { + .mdc-evolution-chip-set__chips { min-height: 40px; } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-wrapper { + .mat-mdc-text-field-wrapper { padding: 0; } } -/* TODO(mdc-migration): The following rule targets internal classes of tooltip that may no longer apply for the MDC version. */ -.mat-tooltip-hide { +.mat-mdc-tooltip-hide { display: none; } diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss index 66f5507fa5..9ad8d5ed73 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.scss @@ -2,8 +2,7 @@ color: var(--theme-accent-color-default-contrast); background-color: var(--theme-accent-color); - /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ - .mat-chip-remove { + .mat-mdc-chip-remove { color: var(--theme-accent-color-default-contrast); opacity: 1; } diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss index 5f3578eca1..75c8fac4e9 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.scss @@ -7,15 +7,14 @@ padding: 5px 0; overflow-y: auto; - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-label { + .mat-mdc-checkbox label { text-overflow: ellipsis; overflow: hidden; width: 100%; + font-weight: bold; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-layout { + .mat-mdc-checkbox { width: 100%; } @@ -24,15 +23,6 @@ overflow: hidden; white-space: nowrap; } - - .mat-mdc-checkbox { - margin: 5px; - - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - &.mat-checkbox-checked .mat-checkbox-label { - font-weight: bold; - } - } } .adf-facet-result-filter { @@ -61,13 +51,7 @@ line-height: 24px; letter-spacing: 0.25px; - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-underline { - display: none; - } - - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { + .mat-mdc-form-field-text-suffix { padding-right: 1px; } } @@ -86,9 +70,8 @@ } } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-label, - .mat-radio-label { + .mat-mdc-checkbox label, + .mat-mdc-radio-button label { color: var(--adf-theme-foreground-text-color-054); } } diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss index 9a20823480..3368cbb813 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss @@ -11,7 +11,6 @@ adf-search-facet-chip-tabbed { } adf-search-filter-tabbed { - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .mat-mdc-tab-body-content { margin-top: 16px; } diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss index 07a755cbfa..cf86596ff5 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss @@ -19,8 +19,7 @@ color: unset; } - /* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version. */ - &.mat-chip-list-wrapper { + &.mdc-evolution-chip-set__chips { margin: 4px 6px; } } diff --git a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss index 92990a17be..2e0825bfbb 100644 --- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss @@ -1,23 +1,15 @@ adf-search-filter-tabbed { - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - .mat-tab-label { + .mdc-tab__text-label { flex: 1; - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &.mat-tab-label-active { + &.mdc-tab__text-label-active { border-bottom: 2px solid var(--theme-primary-color); } } - // The important tag is used here as a workaround for a bug in angular material, when MatTabs are used in conjunction with MatMenu - // https://github.com/angular/components/issues/27426 - - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .mat-mdc-tab-body.mat-tab-body-active .mat-tab-body-content { display: block; - visibility: visible !important; + visibility: visible; } .mat-ink-bar { diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss index 7f061ccc74..48ac6ac902 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.scss @@ -4,9 +4,8 @@ color: var(--adf-theme-foreground-text-color-087); } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-label, - .mat-radio-label { + .mat-mdc-checkbox label, + .mat-mdc-radio-button label { color: var(--adf-theme-foreground-text-color-054); } } diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss index 6a44f35c80..1fd996bd08 100644 --- a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss +++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss @@ -8,8 +8,7 @@ align-content: center; overflow: hidden; - /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - .mat-button-wrapper { + .mdc-button__label { display: flex; align-items: center; } diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss index cb5f49a4d9..e1a564c757 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss @@ -18,26 +18,19 @@ adf-search-properties { .adf-search-properties-file-size-operator, .adf-search-properties-file-size-unit { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { border: 1px solid var(--adf-theme-mat-grey-color-a400); border-radius: 5px; padding: 9px; } &.mat-focused { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { outline: 2px auto -webkit-focus-ring-color; } } } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-underline { - display: none; - } - .adf-search-properties-file-size-unit { width: 78px; } @@ -45,12 +38,8 @@ adf-search-properties { adf-search-chip-autocomplete-input { display: block; - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-outline { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-outline { + .mdc-text-field--outlined { + .mdc-text-field--outlined { &-start, &-end { border-top: 1px solid var(--adf-theme-mat-grey-color-a400); @@ -68,19 +57,14 @@ adf-search-properties { } .mat-focused { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-outline { + .mdc-text-field--outlined { outline: 2px auto -webkit-focus-ring-color; } } .mat-form-field-appearance-outline { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-outline-thick { - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-outline { + .mdc-text-field--outlined-thick { + .mdc-text-field--outlined { &-start, &-end { border-width: 1px; diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss index c0819906f1..9b8f9f9f00 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.scss @@ -9,15 +9,13 @@ } .adf-facet-filter { - /* TODO(mdc-migration): The following rule targets internal classes of radio that may no longer apply for the MDC version. */ - .mat-radio-label-content { + .mat-mdc-radio-button label-content { text-overflow: ellipsis; overflow: hidden; width: 100%; } - /* TODO(mdc-migration): The following rule targets internal classes of radio that may no longer apply for the MDC version. */ - .mat-radio-label { + .mat-mdc-radio-button label { width: 100%; } 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 df8e94f619..0f127bdc9b 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 @@ -46,8 +46,7 @@ } } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { - display: flex; + .mat-mdc-form-field-infix { border-top-width: 0; padding: 0; } diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss index 0904a21ea4..798417456b 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss @@ -714,7 +714,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width !default; /* [Accessibility] Material checkbox labels */ /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ -.adf-checkbox-sr-only .mat-checkbox-label { +.adf-checkbox-sr-only .mat-mdc-checkbox label { position: absolute; width: 1px; height: 1px; diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss index 27e7138c3a..6eb5e8cea6 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.scss +++ b/lib/core/src/lib/form/components/form-renderer.component.scss @@ -124,7 +124,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ - & .mat-card-header-text { + & .mat-mdc-card-header-text { margin: 0 !important; } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ @@ -134,7 +134,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - & .mat-tab-label { + & .mdc-tab__text-label { font-size: var(--theme-subheading-2-font-size); line-height: var(--theme-headline-line-height); letter-spacing: -0.4px; @@ -148,7 +148,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - & .mat-form-field-wrapper { + & .mat-mdc-text-field-wrapper { margin: 0 12px 0 0; } } @@ -218,7 +218,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - & .mat-button-wrapper { + & .mdc-button__label { width: 58px; height: 20px; opacity: 0.54; diff --git a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss index 41df12d584..c18ebc2ed3 100644 --- a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss +++ b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss @@ -8,7 +8,7 @@ $adf-inplace-input-padding: 7px; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { display: flex; border-top: 0; } diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss index 178d17def5..dfabaf87e6 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss @@ -2,7 +2,7 @@ &-date-time-widget { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { + .mat-mdc-form-field-text-suffix { top: 26px; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ @@ -15,12 +15,12 @@ &-left-label-input-datepicker { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { + .mat-mdc-form-field-text-suffix { top: 0; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { width: 100%; } } diff --git a/lib/core/src/lib/form/components/widgets/form.theme.scss b/lib/core/src/lib/form/components/widgets/form.theme.scss index 52b58ed585..afa7135207 100644 --- a/lib/core/src/lib/form/components/widgets/form.theme.scss +++ b/lib/core/src/lib/form/components/widgets/form.theme.scss @@ -36,7 +36,7 @@ ul > li > form-field > .adf-focus { &-invalid { /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ - .mat-checkbox-layout { + .mat-mdc-checkbox { padding-bottom: 12px; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.component.scss b/lib/core/src/lib/identity-user-info/identity-user-info.component.scss index 9b03dd27d0..58abeed9bd 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.component.scss +++ b/lib/core/src/lib/identity-user-info/identity-user-info.component.scss @@ -49,9 +49,8 @@ width: 100%; min-width: 250px; } - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-userinfo-tab .mat-tab-label { + + &-userinfo-tab .mdc-tab__text-label { flex: auto; font-weight: 500; font-size: var(--theme-body-1-font-size); @@ -104,9 +103,8 @@ border: 0; vertical-align: middle; } - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-hide-tab .mat-tab-label-active { + + &-hide-tab .mdc-tab__text-label-active { display: none; } } diff --git a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss index 1635241895..b6962ff876 100644 --- a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss +++ b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss @@ -16,10 +16,9 @@ $adf-info-drawer-icon-size-half: 24px !default; width: 100%; background-color: var(--theme-card-background-color); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.27); - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - & .mat-tab-label { - height: 32px; + + & .mdc-tab__text-label { + font-weight: bold; text-align: left; opacity: 1; } @@ -68,7 +67,7 @@ $adf-info-drawer-icon-size-half: 24px !default; > *:last-child { margin-bottom: 0; } - /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .adf-info-drawer-tabs .mat-tab-body-content { .adf-manage-versions-empty, diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.scss b/lib/core/src/lib/info-drawer/info-drawer.component.scss index d57d5c855c..483783f64e 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.scss +++ b/lib/core/src/lib/info-drawer/info-drawer.component.scss @@ -6,7 +6,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - .mat-tab-label { + .mdc-tab__text-label { min-width: 0; } @@ -43,7 +43,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - .mat-tab-label { + .mdc-tab__text-label { flex-grow: 1; .mat-icon + span { diff --git a/lib/core/src/lib/login/components/login.component.scss b/lib/core/src/lib/login/components/login.component.scss index a4fa15c5fc..04690de215 100644 --- a/lib/core/src/lib/login/components/login.component.scss +++ b/lib/core/src/lib/login/components/login.component.scss @@ -94,9 +94,8 @@ .adf-error-message .adf-error-icon { margin-right: 10px; } - /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version.*/ - /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version.*/ - .mat-card-header-text { + + .mat-mdc-card-header-text { margin: 0 auto; } @@ -120,9 +119,8 @@ line-height: normal; box-shadow: none; } - /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ - /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ - .adf-login-button .mat-button-wrapper { + + .adf-login-button .mdc-button__label { display: inline-flex; } @@ -200,9 +198,8 @@ .mat-mdc-form-field .adf-login-password-icon.mat-icon { color: var(--adf-theme-foreground-text-color); } - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ - /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ - .adf-login__field .mat-form-field-wrapper { + + .adf-login__field .mat-mdc-text-field-wrapper { margin: 1em 0 0; font-size: var(--theme-subheading-2-font-size); } @@ -235,9 +232,8 @@ .adf-login__remember-me { padding-top: 22px; } - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/ - /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/ - .adf-login__remember-me .mat-checkbox-label { + + .adf-login__remember-me .mat-mdc-checkbox label { opacity: 0.87; } diff --git a/lib/core/src/lib/search-text/search-text-input.component.scss b/lib/core/src/lib/search-text/search-text-input.component.scss index 922c1083a7..c41a6809f3 100644 --- a/lib/core/src/lib/search-text/search-text-input.component.scss +++ b/lib/core/src/lib/search-text/search-text-input.component.scss @@ -28,7 +28,7 @@ background-color: var(--adf-theme-primary-50); /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-ripple { + .mdc-line-ripple { background-color: var(--adf-theme-primary-50); } } diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss index f7efd82d8b..53023b26d9 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss @@ -57,7 +57,7 @@ padding-left: 10px; /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - .mat-button-wrapper { + .mdc-button__label { display: inline; } diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss index 37746aa792..fa5f3cd552 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss +++ b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss @@ -1,7 +1,7 @@ .adf { &-date-widget { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { + .mat-mdc-form-field-text-suffix { top: 26px; } @@ -13,12 +13,12 @@ &-left-label-input-datepicker { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-suffix { + .mat-mdc-form-field-text-suffix { top: 0; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - .mat-form-field-infix { + .mat-mdc-form-field-infix { width: 100%; } } diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss index 6f7da1da5e..f8c84423d7 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss @@ -14,7 +14,7 @@ } /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - & .mat-button-wrapper { + & .mdc-button__label { width: 58px; height: 20px; opacity: 0.54; diff --git a/lib/process-services/src/lib/form/start-form.component.scss b/lib/process-services/src/lib/form/start-form.component.scss index a5860f7272..768d171ab1 100644 --- a/lib/process-services/src/lib/form/start-form.component.scss +++ b/lib/process-services/src/lib/form/start-form.component.scss @@ -8,7 +8,7 @@ overflow: hidden; } /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ - & .mat-card-header-text { + & .mat-mdc-card-header-text { margin: 0 !important; } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ @@ -16,7 +16,7 @@ overflow: hidden; } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - & .mat-tab-label { + & .mdc-tab__text-label { font-size: var(--theme-subheading-2-font-size); line-height: var(--theme-headline-line-height); letter-spacing: -0.4px; @@ -29,7 +29,7 @@ height: 4px; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - & .mat-form-field-wrapper { + & .mat-mdc-text-field-wrapper { margin: 0 12px 0 0; } } @@ -95,7 +95,7 @@ border-radius: 5px; } /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - & .mat-button-wrapper { + & .mdc-button__label { width: 58px; height: 20px; opacity: 0.54; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss index 097375d7ab..3169fba8ef 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss @@ -39,7 +39,7 @@ &-attach-widget-repo-button { padding-left: 10px; /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - .mat-button-wrapper { + .mdc-button__label { display: inline; } @@ -70,13 +70,13 @@ margin-bottom: 0; } /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - .mat-list-text { + .mdc-list-item__primary-text { max-width: 200px; } @include layout-bp(lt-md) { /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ - .mat-list-text { + .mdc-list-item__primary-text { max-width: 150px; } } diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss index fedd86bd9b..27069720a4 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss @@ -63,7 +63,7 @@ min-width: 250px; } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-userinfo-tab .mat-tab-label { + &-userinfo-tab .mdc-tab__text-label { flex: auto; font-weight: 500; font-size: var(--theme-body-1-font-size); @@ -147,7 +147,7 @@ text-align: left; } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - &-hide-tab .mat-tab-label-active { + &-hide-tab .mdc-tab__text-label-active { display: none !important; } } diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task.component.scss index 250e40d81b..b176f081f0 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.scss +++ b/lib/process-services/src/lib/task-list/components/start-task.component.scss @@ -95,7 +95,7 @@ adf-start-task { .adf { /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ - &-start-task-input-container .mat-form-field-wrapper { + &-start-task-input-container .mat-mdc-text-field-wrapper { padding-top: 8px; } diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.scss b/lib/process-services/src/lib/task-list/components/task-details.component.scss index c55189362f..0bbfff03d1 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.scss +++ b/lib/process-services/src/lib/task-list/components/task-details.component.scss @@ -88,7 +88,7 @@ adf-task-details { } } /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ - & .mat-tab-label { + & .mdc-tab__text-label { flex-grow: 1; } } diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss index b14c991377..c9e3566743 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss @@ -13,7 +13,7 @@ border-radius: 5px; } /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - & .mat-button-wrapper { + & .mdc-button__label { width: 58px; height: 20px; opacity: 0.54; diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.scss b/lib/process-services/src/lib/task-list/components/task-standalone.component.scss index 172a6a8bed..138319690a 100644 --- a/lib/process-services/src/lib/task-list/components/task-standalone.component.scss +++ b/lib/process-services/src/lib/task-list/components/task-standalone.component.scss @@ -47,7 +47,7 @@ border-radius: 5px; } /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ - & .mat-button-wrapper { + & .mdc-button__label { opacity: 0.54; font-size: var(--theme-button-font-size); font-weight: bold; diff --git a/stylelint-config.json b/stylelint-config.json index 0294b8e491..f78f27a5b7 100644 --- a/stylelint-config.json +++ b/stylelint-config.json @@ -91,7 +91,7 @@ "max-line-length": 240, "linebreaks": "unix", "selector-class-pattern": [ - "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper|page)", + "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|mdc-|material-|textLayer|canvasWrapper|page)", { "resolveNestedSelectors": true }