diff --git a/.stylelintrc.json b/.stylelintrc.json index 33bc0157c6..52c8a8dbaf 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -5,7 +5,7 @@ "alpha-value-notation": "number", "function-name-case": "lower", "selector-class-pattern": [ - "^_?(adf|adf-|aca-|app|app-|cdk-||mat-|material-)", + "^_?(adf|adf-|aca-|app|app-)", { "resolveNestedSelectors": true } diff --git a/package-lock.json b/package-lock.json index a1b97add4f..81ef16c611 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.7.0-7828326288", - "@alfresco/adf-core": "6.7.0-7828326288", - "@alfresco/adf-extensions": "6.7.0-7828326288", - "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7828326288", - "@alfresco/js-api": "7.6.0-7828326288", + "@alfresco/adf-content-services": "6.7.0-7885225129", + "@alfresco/adf-core": "6.7.0-7885225129", + "@alfresco/adf-extensions": "6.7.0-7885225129", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7885225129", + "@alfresco/js-api": "7.6.0-7885225129", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -42,7 +42,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.7.0-7828326288", + "@alfresco/adf-cli": "6.7.0-7885225129", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -123,12 +123,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.7.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-7828326288.tgz", - "integrity": "sha512-JTEOIPHFVTTTULnEabDFnrKYxafdjEMqN7TTNy56Ygfokl/o/CrlQ8SGSeGrZOyNyKkyqLs7y0BSKFWZt9SByg==", + "version": "6.7.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-7885225129.tgz", + "integrity": "sha512-wPXf1hbwXEBCePK1/St+eIBsDy8gpjN79HwmH1Vm8JmUBRCrXLMo33ztIGO00qiaynBfCQowB/drqlpvJKLSOQ==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.6.0-7828326288", + "@alfresco/js-api": ">=7.6.0-7885225129", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -143,15 +143,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.7.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-7828326288.tgz", - "integrity": "sha512-+5jb8sZHCTNPgsRt+NXbbM3ABwAVUxkAL1FAntVIdBsnzfjSDFgbBx1SzhS2yrjTv3UwNHcnlvpWJOrASyiOmQ==", + "version": "6.7.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-7885225129.tgz", + "integrity": "sha512-y82lUb5KFjF2BBkEx7SOmNu34xcN2ptkrLflKUQGIZ3RvmCCePqhaTSb9T0VIfezjKTWx5DyVgVLjRb4+nG67g==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.7.0-7828326288", - "@alfresco/js-api": ">=7.6.0-7828326288", + "@alfresco/adf-core": ">=6.7.0-7885225129", + "@alfresco/js-api": ">=7.6.0-7885225129", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -166,9 +166,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.7.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-7828326288.tgz", - "integrity": "sha512-WF+QAwP85DuDqlwsdMGbH7RN/SuAnvWx4URqAfz9EPvQo0+aWWWVRcJNFRRxP8N8q2lIiYRybZlBMBZdJ8x07w==", + "version": "6.7.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-7885225129.tgz", + "integrity": "sha512-tRCzCT9BpzCFOsq3bXsjeSxOS1MsEB/uZrg7lDS/dFFzO/JeZaVPL8PHR+PX18TxrE6uCjjpcFjseijTB3Kkcw==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -176,8 +176,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.7.0-7828326288", - "@alfresco/js-api": ">=7.6.0-7828326288", + "@alfresco/adf-extensions": ">=6.7.0-7885225129", + "@alfresco/js-api": ">=7.6.0-7885225129", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -192,27 +192,27 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.7.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-7828326288.tgz", - "integrity": "sha512-n0GHsGgc/hlknsuwqkFbMQ5zBhB3ngeN6y/7M3n7v79vmQzOYbcWKoEEuMmLARKODXfeuAeQcDAB+7QMm7dwvQ==", + "version": "6.7.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-7885225129.tgz", + "integrity": "sha512-sVRNMPSjlj/3LPLxJE6bvvoz7ZaGnkKotmNAuUjoK6wMML10Rk5DGIZreprsgcoFU7UEaUhDOrZhvL9Lqif4ZA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.6.0-7828326288", + "@alfresco/js-api": ">=7.6.0-7885225129", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.7.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-7828326288.tgz", - "integrity": "sha512-HUYxMlrccRBlMLZO02J/KsaPoZiuXaGkdcnI2nEvEin2WBQ0y49jFipBG1HjNlN+zNKGZvvn6X/zaDEngbd1uQ==" + "version": "6.7.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-7885225129.tgz", + "integrity": "sha512-tvDOLEImC3KmxSpifNPCMl1+bF8Hh+aKpbPAUS/qRyFnvqVRt5g6grkEfuUNsLCqyORoX7TSf8dxLcibG+QEsg==" }, "node_modules/@alfresco/js-api": { - "version": "7.6.0-7828326288", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-7828326288.tgz", - "integrity": "sha512-HzAFeB0r1LMQKMvqK7NaEm5L+0FoK9eU89TILpyfeGqRJTk+Z+vo2cM5PW6ens2jczpxvK5QSH0MtEJ4jIOF9Q==", + "version": "7.6.0-7885225129", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-7885225129.tgz", + "integrity": "sha512-z+oedLdFe5R0mvHoZmlg/XPlQ1ttOZzbMQb198KCzCeWj0SCnCaTdhv+gBsTn2mZl2qSaaGXjmuVPJ8tLXDidA==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^8.0.9", diff --git a/package.json b/package.json index 1b0f2c2e77..5e0e2b3202 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.7.0-7828326288", - "@alfresco/adf-core": "6.7.0-7828326288", - "@alfresco/adf-extensions": "6.7.0-7828326288", - "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7828326288", - "@alfresco/js-api": "7.6.0-7828326288", + "@alfresco/adf-content-services": "6.7.0-7885225129", + "@alfresco/adf-core": "6.7.0-7885225129", + "@alfresco/adf-extensions": "6.7.0-7885225129", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7885225129", + "@alfresco/js-api": "7.6.0-7885225129", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -66,7 +66,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.7.0-7828326288", + "@alfresco/adf-cli": "6.7.0-7885225129", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html index 2250e3f5b7..a2616dfa37 100644 --- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html @@ -11,7 +11,7 @@ - + - + diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss index d3dfd7bec4..5127b23c16 100644 --- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss @@ -4,7 +4,7 @@ flex-direction: row; gap: 8px; - mat-form-field { + .aca-rule-simple-condition__form__field-input { flex: 2; font-size: inherit; } diff --git a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html index 5d64831f58..dbf8134051 100644 --- a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html @@ -3,7 +3,7 @@ {{ title | translate }} diff --git a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss index bfadfac1e1..9a6e7228ae 100644 --- a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss @@ -20,7 +20,7 @@ } &__close { - & mat-icon { + & .aca-edit-rule-dialog__header__icon { font-size: 18px; } } diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss index 1cf1579f60..3b768200d8 100644 --- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss @@ -73,6 +73,7 @@ } } + /* stylelint-disable selector-class-pattern */ &.aca-read-only, .mat-form-field-disabled { .mat-form-field-underline, diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html index 27e424016c..e6cf151a22 100644 --- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html @@ -13,7 +13,7 @@ {{ 'ACA_FOLDER_RULES.RULE_LIST.INHERITED_RULES' | translate }} - + info diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss index eb45570bb3..e95b8d847f 100644 --- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss @@ -35,7 +35,7 @@ justify-content: flex-start; flex: 1; - &__mat-icon { + &__icon { transform: scale(0.8); } } diff --git a/projects/aca-content/src/lib/components/details/details.component.html b/projects/aca-content/src/lib/components/details/details.component.html index d0c1bc6d56..ab15650517 100644 --- a/projects/aca-content/src/lib/components/details/details.component.html +++ b/projects/aca-content/src/lib/components/details/details.component.html @@ -12,7 +12,7 @@ {{ 'APP.INFO_DRAWER.ICON' | translate }} {{ node.name }} -
+
- clear + clear
diff --git a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss index c30aeabde2..c9b04cd083 100644 --- a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss +++ b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss @@ -5,7 +5,7 @@ $top-margin: 12px; margin: 14px 1px; float: left; - mat-icon { + .app-search-input-control-icon { font-size: 24px; cursor: pointer; } @@ -24,16 +24,13 @@ $top-margin: 12px; box-sizing: border-box; margin-bottom: 12px; + /* stylelint-disable-next-line selector-class-pattern */ .mat-form-field-underline { display: none; } - .mat-form-field-label-wrapper { + label { cursor: text; - } - - // fixes pointer event on FF - &.app-search-menu-trigger .mat-form-field-label-wrapper { pointer-events: auto; } diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss b/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss index 514177e846..e34f06f5a5 100644 --- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss +++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss @@ -78,24 +78,26 @@ $top-margin: 12px; letter-spacing: -0.7px; margin-bottom: -8px; + .app-search-options-checkbox label { + max-width: 155px; + } + &-checkbox { padding: 3px 24px 3px 19px; + /* stylelint-disable-next-line selector-class-pattern */ .mat-checkbox-inner-container { height: 18px; width: 18px; } - .mat-checkbox-label { + /* stylelint-disable-next-line no-descending-specificity */ + label { padding: 0 0 0 11px; overflow: hidden; text-overflow: ellipsis; } } - - .app-search-options-checkbox label { - max-width: 155px; - } } .app-search-hint { @@ -122,17 +124,17 @@ $top-margin: 12px; #search-options { padding-left: 20px; - mat-checkbox { + label { + max-width: 105px; + } + + .app-search-options-checkbox { padding: 3px 20px 3px 0; - .mat-checkbox-label { + label { padding: 0; } } - - label { - max-width: 105px; - } } } diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss index 9a0cbe4844..2bd478ccba 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss @@ -45,10 +45,10 @@ aca-search-results { color: var(--theme-search-chip-icon-color); } - mat-icon { - color: var(--theme-search-chip-icon-color); - } + .adf-search-filter-chip-icon { + color: var(--theme-search-chip-icon-color); } + } .adf-search-filter-placeholder { color: var(--theme-selected-text-color); diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.html b/projects/aca-content/src/lib/components/view-profile/view-profile.component.html index 7103578429..f49f5476f8 100644 --- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.html +++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.html @@ -27,7 +27,7 @@

{{'APP.EDIT_PROFILE.GENERAL' | translate}}

(click)="onSaveGeneralData(profileForm)">{{'APP.EDIT_PROFILE.SAVE' | translate}}
- +
@@ -96,7 +96,7 @@

{{'APP.EDIT_PROFILE.COMPANY_DETAILS' | translate}} (click)="onSaveCompanyData(profileForm)">{{'APP.EDIT_PROFILE.SAVE' | translate}}

- +
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss b/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss index a2fe1c0ebe..e05c92093b 100644 --- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss +++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss @@ -75,7 +75,7 @@ app-view-profile { text-align: end; } - .app-mat-divider { + .app-divider { border-top-width: 2px; border-top-color: var(--theme-grey-background-color); padding-left: -1px; diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss index 4ca4c60273..00b3e02711 100644 --- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss +++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss @@ -17,10 +17,6 @@ app-create-from-template-dialog { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - - .bold { - font-weight: 600; - } } &-field { diff --git a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss index 8f75224ce7..6aadd8a85a 100644 --- a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss +++ b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss @@ -1,3 +1,4 @@ +/* stylelint-disable selector-class-pattern */ @mixin adf-about-theme($theme) { adf-about { /* custom ADF About Component Theme */ diff --git a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss index 7501bf9bb1..e20fc65cdf 100644 --- a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss +++ b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss @@ -1,3 +1,4 @@ +/* stylelint-disable selector-class-pattern */ @mixin adf-pagination-theme($theme) { adf-pagination { &.adf-pagination { diff --git a/projects/aca-content/src/lib/ui/overrides/ay11.scss b/projects/aca-content/src/lib/ui/overrides/ay11.scss index 7f76cd6fa6..11403da3af 100644 --- a/projects/aca-content/src/lib/ui/overrides/ay11.scss +++ b/projects/aca-content/src/lib/ui/overrides/ay11.scss @@ -1,3 +1,4 @@ +/* stylelint-disable selector-class-pattern */ @mixin ay11-theme() { .mat-icon-button, .mat-button, diff --git a/projects/aca-content/src/lib/ui/theme.scss b/projects/aca-content/src/lib/ui/theme.scss index ec6d2e8b96..0600543ee9 100644 --- a/projects/aca-content/src/lib/ui/theme.scss +++ b/projects/aca-content/src/lib/ui/theme.scss @@ -1,3 +1,4 @@ +/* stylelint-disable selector-class-pattern */ @use '@angular/material' as mat; @import '@alfresco/adf-core/theming'; @import 'custom-theme'; diff --git a/projects/aca-shared/src/lib/components/generic-error/generic-error.component.html b/projects/aca-shared/src/lib/components/generic-error/generic-error.component.html index 457f3475a0..a56e4323cf 100644 --- a/projects/aca-shared/src/lib/components/generic-error/generic-error.component.html +++ b/projects/aca-shared/src/lib/components/generic-error/generic-error.component.html @@ -1,4 +1,4 @@ -error +error

{{ text | translate }}

diff --git a/projects/aca-shared/src/lib/components/generic-error/generic-error.component.scss b/projects/aca-shared/src/lib/components/generic-error/generic-error.component.scss index 14a020a05c..bfdf99824a 100644 --- a/projects/aca-shared/src/lib/components/generic-error/generic-error.component.scss +++ b/projects/aca-shared/src/lib/components/generic-error/generic-error.component.scss @@ -11,7 +11,7 @@ font-size: 16px; } - mat-icon { + &__icon { color: var(--theme-warn-color, #f44336); font-size: 52px; height: 52px;