diff --git a/demo-shell/src/app/components/app-layout/user-info/user-info.component.html b/demo-shell/src/app/components/app-layout/user-info/user-info.component.html index 8b2e071e5ec..e4820fb808f 100644 --- a/demo-shell/src/app/components/app-layout/user-info/user-info.component.html +++ b/demo-shell/src/app/components/app-layout/user-info/user-info.component.html @@ -1,21 +1,21 @@ - - - - \ No newline at end of file + diff --git a/demo-shell/src/app/components/cloud/cloud-filters-demo.component.scss b/demo-shell/src/app/components/cloud/cloud-filters-demo.component.scss index 8806abc49eb..4c7032fc383 100644 --- a/demo-shell/src/app/components/cloud/cloud-filters-demo.component.scss +++ b/demo-shell/src/app/components/cloud/cloud-filters-demo.component.scss @@ -1,4 +1,4 @@ app-cloud-task-filters .app-filters__entry, app-cloud-process-filters .app-filters__entry { - padding-left: 0 !important; + padding-left: 0; } diff --git a/demo-shell/src/app/components/files/files.component.scss b/demo-shell/src/app/components/files/files.component.scss index 90080aa61bb..cbce74ceffa 100644 --- a/demo-shell/src/app/components/files/files.component.scss +++ b/demo-shell/src/app/components/files/files.component.scss @@ -1,5 +1,5 @@ -.app-container { - margin: 10px !important; +.app-container:has(.app-document-list-container) { + margin: 10px; } .app-error-message { diff --git a/docs/user-guide/theming.md b/docs/user-guide/theming.md index 2c49d475e54..eefe993c4f2 100644 --- a/docs/user-guide/theming.md +++ b/docs/user-guide/theming.md @@ -141,9 +141,6 @@ Any component with the `add-dark-theme` class will use the dark theme, while ot ## Default reusable class ```css -.adf-hide-small // Display none vieweport <960px -.adf-hide-xsmall // Display none vieweport <600px - .accent-color // Accent color .warn-color // Warn color .primary-contrast-text-color // Default contrast color for primary color 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 0e2822af4a3..080e9260ee9 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 @@ -114,9 +114,9 @@ h2.adf-search-results-label { fill: var(--theme-primary-color); } - .adf-no-content-container { + .adf-no-content-container.adf-datatable-cell { text-align: center; - border: none !important; + border: none; } .adf-datatable-cell { @@ -167,8 +167,8 @@ h2.adf-search-results-label { } &-searchLayout { - .adf-datatable-list .adf-datatable-row { - min-height: 65px !important; + .adf-datatable-list .adf-datatable-body .adf-datatable-row { + min-height: 65px; .adf-datatable-cell { .adf-name-location-cell-location { 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 7b2b78640d1..39400f0dfe2 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 @@ -131,6 +131,13 @@ &-userinfo-detail { text-align: left; } + + &-hide-small.adf-userinfo-profile-initials, + &-hide-small.adf-userinfo-profile-container { + @include layout-bp(lt-md) { + display: none; + } + } } @media only screen and (min-device-width: 480px) { diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.scss b/lib/content-services/src/lib/document-list/components/document-list.component.scss index ac36c467e2e..7581ce55a2e 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.scss +++ b/lib/content-services/src/lib/document-list/components/document-list.component.scss @@ -109,7 +109,7 @@ .adf-empty-list-header { height: 32px; - opacity: 0.26 !important; + opacity: 0.26; font-size: var(--theme-headline-font-size); line-height: 1.33; letter-spacing: -1px; @@ -179,8 +179,8 @@ } .adf-datatable-gallery-thumbnails { - .adf-datatable-card .adf-datatable-row { - height: 300px !important; + .adf-datatable-card .adf-datatable-row:is(adf-datatable-row) { + height: 300px; img { height: 130px; diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss index 646a62b0536..6aab1a2c34c 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss @@ -1,5 +1,5 @@ -.adf { - &-people-initial { +.adf-cell-value { + .adf-people-initial { background: var(--theme-primary-color); border-radius: 50%; display: flex; @@ -7,25 +7,32 @@ align-items: center; width: 40px; height: 40px; - color: var(--theme-primary-color-default-contrast) !important; + color: var(--theme-primary-color-default-contrast); font-weight: bolder; font-size: var(--theme-adf-picture-1-font-size); text-transform: uppercase; } - &-group-icon { - height: 20px !important; - width: 20px !important; + .adf-group-icon { + height: 20px; + width: 20px; background: var(--theme-primary-color); border-radius: 50%; padding: 10px; - color: var(--theme-primary-color-default-contrast) !important; + color: var(--theme-primary-color-default-contrast); font-weight: bolder; font-size: var(--theme-title-font-size); } - &-people-select-icon { - margin: 0 !important; + .adf-datatable-selected { + height: 100%; + width: 100%; + margin-left: -2px; + margin-top: 2px; + } + + .adf-people-select-icon { + margin: 0; svg { fill: var(--theme-accent-color); @@ -33,11 +40,4 @@ height: 40px; } } - - &-datatable-selected { - height: 100%; - width: 100%; - margin-left: -2px; - margin-top: 2px; - } } diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html index f4fc8c6c37d..9e46b658dae 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html @@ -12,6 +12,7 @@ [matTooltip]="getTooltipTranslation(col?.title)"> diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss index 37c91336f33..64b19121c78 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.scss @@ -1,20 +1,20 @@ .adf-filter { - &-button { - margin-left: -7px !important; + &-button:has(.adf-filter-icon) { + margin-left: -7px; .adf-icon { opacity: 1; color: var(--adf-theme-foreground-icon-color); - &-active { + &.adf-icon-active { color: var(--theme-primary-color); span { - border: 2px solid var(--adf-theme-background-card-color) !important; + border: 2px solid var(--adf-theme-background-card-color); width: 10px; height: 10px; - top: -3px !important; - right: -6px !important; + top: -3px; + right: -6px; } } } @@ -24,7 +24,7 @@ display: flex; flex-direction: column; padding: 15px 15px 10px; - color: var(--adf-theme-foreground-text-color-087) !important; + color: var(--adf-theme-foreground-text-color-087); .adf-facet-buttons { display: none; @@ -35,7 +35,7 @@ } input { - background: 2px solid var(--adf-theme-background-card-color) !important; + background: 2px solid var(--adf-theme-background-card-color); } } 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 11ab6f41ee9..2c6f4ad7894 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 @@ -5,6 +5,7 @@ adf-search-filter-tabbed { // 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 + /* stylelint-disable declaration-no-important */ .adf-search-tab-content-active { & > div { visibility: visible !important; diff --git a/lib/content-services/src/lib/social/rating.component.scss b/lib/content-services/src/lib/social/rating.component.scss index a0ae86c0d20..dba98d712dd 100644 --- a/lib/content-services/src/lib/social/rating.component.scss +++ b/lib/content-services/src/lib/social/rating.component.scss @@ -32,9 +32,9 @@ $adf-average-star-color: #808080; color: $adf-rated-star-color; } - .adf-grey-star, - .adf-average-star { - color: $adf-average-star-color !important; + .adf-colored-star.adf-grey-star, + .adf-colored-star.adf-average-star { + color: $adf-average-star-color; } } diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.html b/lib/content-services/src/lib/tag/tag-node-list.component.html index 020a7beee05..3cd8d86757d 100644 --- a/lib/content-services/src/lib/tag/tag-node-list.component.html +++ b/lib/content-services/src/lib/tag/tag-node-list.component.html @@ -3,7 +3,7 @@ - {{currentEntry.entry.tag}} + {{currentEntry.entry.tag}} cancel diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.scss b/lib/content-services/src/lib/tag/tag-node-list.component.scss index 7b109c7a458..2c632b5804a 100644 --- a/lib/content-services/src/lib/tag/tag-node-list.component.scss +++ b/lib/content-services/src/lib/tag/tag-node-list.component.scss @@ -30,11 +30,21 @@ visibility: hidden; } - .adf-tag-chips { + .adf-tag-chips:has(.adf-tag-chips-tag-name) { color: var(--theme-primary-color-default-contrast); background-color: var(--theme-primary-color); height: auto; word-break: break-word; + + .adf-tag-chips-delete-icon { + font-size: var(--theme-title-font-size); + background-repeat: no-repeat; + display: inline-block; + fill: currentcolor; + height: 20px; + width: 20px; + color: var(--theme-primary-color-default-contrast); + } } .adf-tag-chips-delete { @@ -48,14 +58,4 @@ padding: 0; margin: -1px 0 0 10px; } - - .adf-tag-chips-delete-icon { - font-size: var(--theme-title-font-size); - background-repeat: no-repeat; - display: inline-block; - fill: currentcolor; - height: 20px; - width: 20px; - color: var(--theme-primary-color-default-contrast) !important; - } } diff --git a/lib/content-services/src/lib/tree/components/tree.component.scss b/lib/content-services/src/lib/tree/components/tree.component.scss index d527d1fdbe6..14c3dac3238 100644 --- a/lib/content-services/src/lib/tree/components/tree.component.scss +++ b/lib/content-services/src/lib/tree/components/tree.component.scss @@ -72,7 +72,7 @@ $tree-header-font-size: 12px !default; min-width: 100%; box-sizing: border-box; - .adf-tree-cell-header { + .adf-tree-cell-header:has(.adf-tree-cell-value) { cursor: pointer; position: relative; vertical-align: bottom; @@ -80,11 +80,11 @@ $tree-header-font-size: 12px !default; font-weight: bold; line-height: 24px; letter-spacing: 0; - min-height: $tree-row-height !important; + min-height: $tree-row-height; font-size: $tree-header-font-size; color: var(--adf-theme-foreground-text-color); box-sizing: border-box; - padding-top: 12px !important; + padding-top: 12px; &:focus { outline-offset: -1px; diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html index 54dc152b499..e7548428bec 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html +++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html @@ -8,6 +8,7 @@