diff --git a/.stylelintrc.json b/.stylelintrc.json index 52c8a8dba..81a75bbd9 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-)", + "^_?(adf|adf-|aca-|app|app-|cdk-drag-preview)", { "resolveNestedSelectors": true } diff --git a/app/src/app.config.json b/app/src/app.config.json index f52379ce1..cf0a24e80 100644 --- a/app/src/app.config.json +++ b/app/src/app.config.json @@ -42,6 +42,9 @@ "size": 25, "supportedPageSizes": [25, 50, 100] }, + "notification": { + "badgeSize": "medium" + }, "files": { "excluded": [".DS_Store", "desktop.ini", "Thumbs.db", ".git"], "match-options": { diff --git a/app/src/styles.scss b/app/src/styles.scss index f5f2cd41c..e2ac5f399 100644 --- a/app/src/styles.scss +++ b/app/src/styles.scss @@ -1,7 +1,7 @@ +@use '@fontsource/open-sans'; @import 'material-icons/iconfont/material-icons.css'; /* You can add global styles to this file, and also import other style files */ -@import '@fontsource/open-sans'; body, html { diff --git a/e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts b/e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts index 9a8692daa..f95cf5f32 100755 --- a/e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts +++ b/e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts @@ -183,8 +183,6 @@ test.describe('Info Drawer - file folder Properties', () => { test('[XAT-5513] View file properties - General Info fields', async ({ personalFiles }) => { const generalInfoProperties = ['Name', 'Title', 'Creator', 'Created Date', 'Modifier', 'Modified Date', 'Author', 'Description', 'Content Type']; await navigateAndOpenInfoDrawer(personalFiles, folder5513); - await expect(personalFiles.infoDrawer.generalInfoProperties.first()).not.toBeInViewport(); - await personalFiles.infoDrawer.generalInfoAccordion.click(); await expect(personalFiles.infoDrawer.generalInfoProperties.first()).toBeInViewport(); const getPropertiesText = (await personalFiles.infoDrawer.generalInfoProperties.allTextContents()).join(''); for (const property of generalInfoProperties) { diff --git a/e2e/playwright/library-actions/src/tests/library-actions.e2e.ts b/e2e/playwright/library-actions/src/tests/library-actions.e2e.ts index 36fa6522e..6b682f4a6 100644 --- a/e2e/playwright/library-actions/src/tests/library-actions.e2e.ts +++ b/e2e/playwright/library-actions/src/tests/library-actions.e2e.ts @@ -48,7 +48,7 @@ test.describe('Library actions ', () => { const libraryJoinedMessage = 'Library joined'; const requestToJoinMessage = 'Request sent to join this library'; const cancelJoinRequestButton = 'Cancel Join Request'; - const cancelJoinRequestMessage = 'Cancelled the request to join the library'; + const cancelJoinRequestMessage = 'Canceled the request to join the library'; const leaveLibraryButton = 'Leave Library'; const leftMessage = 'You have left the library'; const favoriteButton = 'Favorite'; diff --git a/package-lock.json b/package-lock.json index 99f6a89fd..741e89560 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "7.5.0", "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "8.6.0-26508198141", - "@alfresco/adf-core": "8.6.0-26508198141", - "@alfresco/adf-extensions": "8.6.0-26508198141", - "@alfresco/eslint-plugin-eslint-angular": "8.6.0-26508198141", - "@alfresco/js-api": "9.6.0-26508198141", + "@alfresco/adf-content-services": "8.6.0-26634151190", + "@alfresco/adf-core": "8.6.0-26634151190", + "@alfresco/adf-extensions": "8.6.0-26634151190", + "@alfresco/eslint-plugin-eslint-angular": "8.6.0-26634151190", + "@alfresco/js-api": "9.6.0-26634151190", "@angular/animations": "19.2.20", "@angular/cdk": "19.2.19", "@angular/common": "19.2.20", @@ -46,7 +46,7 @@ "zone.js": "0.15.0" }, "devDependencies": { - "@alfresco/adf-cli": "8.6.0-26508198141", + "@alfresco/adf-cli": "8.6.0-26634151190", "@angular-devkit/build-angular": "19.2.22", "@angular-devkit/core": "19.2.20", "@angular-devkit/schematics": "19.2.20", @@ -103,13 +103,13 @@ } }, "node_modules/@alfresco/adf-cli": { - "version": "8.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-8.6.0-26508198141.tgz", - "integrity": "sha512-umhhphjek7QlcC9cWbBKUW/7nxgLmPdBAMeUoqGwsJCUZx15brcGIxJtPJAWWDT+eq8igSw4Q6GuUFnqP+1W2A==", + "version": "8.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-8.6.0-26634151190.tgz", + "integrity": "sha512-QrRAaC2Qeyx+MfCXW0OhoJvflp/TIx1SVZvr0yEfvxB9Jjs6OW2Sllz6Nczou6KBBk1QXEzK13IpSP+IwCE/Rw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@alfresco/js-api": ">=9.6.0-26508198141", + "@alfresco/js-api": ">=9.6.0-26634151190", "ejs": "^3.1.10", "node-fetch": "^2.7.0", "spdx-license-list": "^5.0.0" @@ -120,16 +120,16 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "8.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-8.6.0-26508198141.tgz", - "integrity": "sha512-0pHf06/hi9v6gAddDOKydlULnmRoPUAgt4PK1FhgMxgqSignbjy3jyxNC78B/oFX4RpAdd3oke3/5S8Iyojf0A==", + "version": "8.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-8.6.0-26634151190.tgz", + "integrity": "sha512-/OLvg71CAuDrrdAmFWJVFx80aNhgBCyLsTsWIj+blJmnnjWrdeUYMgF/DvB+p8ru6Fz8FU7WO0wWUOpAwXGanw==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=8.6.0-26508198141", - "@alfresco/js-api": ">=9.6.0-26508198141", + "@alfresco/adf-core": ">=8.6.0-26634151190", + "@alfresco/js-api": ">=9.6.0-26634151190", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -144,9 +144,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "8.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-8.6.0-26508198141.tgz", - "integrity": "sha512-J0ybk7OmT7GO5hcI8lQNyNorFjTt1cXCYMaakNXpawxpPgcj5jJw/oZfBoFhvxSAXv5HtZjjm/06wDdl+w80HA==", + "version": "8.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-8.6.0-26634151190.tgz", + "integrity": "sha512-o22nwmh+EUtTogx8nWRsThDSan+4G1Jj1fViXWhntPIVMr0rSzMS83d09407kQBYPZQdaqDD8Q2TIijOCKffkw==", "license": "Apache-2.0", "peer": true, "dependencies": { @@ -156,8 +156,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=8.6.0-26508198141", - "@alfresco/js-api": ">=9.6.0-26508198141", + "@alfresco/adf-extensions": ">=8.6.0-26634151190", + "@alfresco/js-api": ">=9.6.0-26634151190", "@angular/animations": ">=16.0.0", "@angular/cdk": ">=16.0.0", "@angular/common": ">=16.0.0", @@ -196,30 +196,30 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "8.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-8.6.0-26508198141.tgz", - "integrity": "sha512-vxQihSdIvXv5NuZ6QV9HLk8xNz/qZfw+NLvCzErMY0k8dJAVZcyPDy9TzxNdCqayNeDQUlvhV5pfK+dO7DNwxg==", + "version": "8.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-8.6.0-26634151190.tgz", + "integrity": "sha512-koMV1UUzvX7Xs0ATD12/Twz5qz7pizZKsiHfCxWv01tQt6YxV+cL8c4JA90GyJJkFvRF4a688cpEwsqrFdyMVA==", "license": "Apache-2.0", "peer": true, "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=9.6.0-26508198141", + "@alfresco/js-api": ">=9.6.0-26634151190", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "8.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-8.6.0-26508198141.tgz", - "integrity": "sha512-WrRgtzxqAj6SZ3rPhsMatBsTsNV112tmDOqqcqLzUXiqr/MhhA+csUOF+Mr/Ac7sd2ZWRbR8OIcoroM6MZJUfg==", + "version": "8.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-8.6.0-26634151190.tgz", + "integrity": "sha512-GcqRDqJAgVBDOae1gKHnH4ySnnJXHrCqerOj3iDEZIb1rJi/QJo6+zwzqWVTAeuWJISG1BLcmCaYNTjWhKKvbw==", "license": "Apache-2.0" }, "node_modules/@alfresco/js-api": { - "version": "9.6.0-26508198141", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-9.6.0-26508198141.tgz", - "integrity": "sha512-aXJOspJsJJBttZMBbPlkLu87VWogMnVt+1qk1ahjrnpSXcQW8b4eEM9Q1Pju4ePHHXPDcoCy6Rdt1bRzpXcZ0g==", + "version": "9.6.0-26634151190", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-9.6.0-26634151190.tgz", + "integrity": "sha512-O8fa/+AkMuh4zIl0WaZaGx0NTa5QV5/3svvLMZ45e1rPfNX8SJqMQEJ/96uVFOTLdQBwSoeYB+5Y0XCJ1xPGKA==", "license": "Apache-2.0", "peer": true, "dependencies": { @@ -11746,16 +11746,15 @@ } }, "node_modules/axios": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz", - "integrity": "sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz", + "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "follow-redirects": "^1.16.0", + "follow-redirects": "^1.15.11", "form-data": "^4.0.5", - "https-proxy-agent": "^5.0.1", "proxy-from-env": "^2.1.0" } }, @@ -11772,33 +11771,6 @@ "axios": "0.x || 1.x" } }, - "node_modules/axios/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/axios/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/axios/node_modules/proxy-from-env": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", @@ -12078,9 +12050,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", - "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", + "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", "dev": true, "license": "MIT", "dependencies": { @@ -12092,7 +12064,7 @@ "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", - "qs": "~6.15.1", + "qs": "~6.14.0", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" @@ -16185,15 +16157,15 @@ } }, "node_modules/express": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", - "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "dev": true, "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "~1.20.5", + "body-parser": "~1.20.3", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", @@ -16212,7 +16184,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", - "qs": "~6.15.1", + "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", @@ -16612,9 +16584,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", - "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", "dev": true, "funding": [ { @@ -21005,16 +20977,16 @@ } }, "node_modules/mermaid/node_modules/uuid": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz", - "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], "license": "MIT", "bin": { - "uuid": "dist-node/bin/uuid" + "uuid": "dist/esm/bin/uuid" } }, "node_modules/methods": { @@ -23965,9 +23937,9 @@ } }, "node_modules/qs": { - "version": "6.15.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", - "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", + "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -27213,9 +27185,9 @@ } }, "node_modules/tmp": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.6.tgz", - "integrity": "sha512-5sJPdPjfI5Kx+qbrDesxkglRBxW//g7hCsqspEjwkewGvBMGIKMOTKzLt1hFVJzyadba3lDUN20O9qhvbQUSTA==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", + "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index efb0cb865..50219bdcd 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "8.6.0-26508198141", - "@alfresco/adf-core": "8.6.0-26508198141", - "@alfresco/adf-extensions": "8.6.0-26508198141", - "@alfresco/eslint-plugin-eslint-angular": "8.6.0-26508198141", - "@alfresco/js-api": "9.6.0-26508198141", + "@alfresco/adf-content-services": "8.6.0-26634151190", + "@alfresco/adf-core": "8.6.0-26634151190", + "@alfresco/adf-extensions": "8.6.0-26634151190", + "@alfresco/eslint-plugin-eslint-angular": "8.6.0-26634151190", + "@alfresco/js-api": "9.6.0-26634151190", "@angular/animations": "19.2.20", "@angular/cdk": "19.2.19", "@angular/common": "19.2.20", @@ -79,7 +79,7 @@ "zone.js": "0.15.0" }, "devDependencies": { - "@alfresco/adf-cli": "8.6.0-26508198141", + "@alfresco/adf-cli": "8.6.0-26634151190", "@angular-devkit/build-angular": "19.2.22", "@angular-devkit/core": "19.2.20", "@angular-devkit/schematics": "19.2.20", diff --git a/projects/aca-content/about/src/about.component.scss b/projects/aca-content/about/src/about.component.scss index b3153eb10..fbd69a26d 100644 --- a/projects/aca-content/about/src/about.component.scss +++ b/projects/aca-content/about/src/about.component.scss @@ -1,6 +1,28 @@ +@use '@angular/material' as mat; + app-about-page { adf-about { padding: 10px; width: 100%; + + @include mat.expansion-overrides( + ( + container-background-color: var(--adf-theme-background-card-color), + container-text-size: 14px, + container-text-line-height: 24px, + container-text-tracking: normal + ) + ); + @include mat.card-overrides( + ( + outlined-container-color: var(--adf-theme-background-card-color) + ) + ); + @include mat.table-overrides( + ( + background-color: var(--adf-theme-background-card-color), + row-item-outline-color: var(--adf-theme-foreground-divider-color) + ) + ); } } diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html index c2b9597f9..3e6376514 100644 --- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html @@ -11,7 +11,7 @@
- + @@ -47,7 +47,7 @@ diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss index 7dd91663e..a1db425bd 100644 --- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss @@ -2,30 +2,33 @@ @use '@angular/material' as mat; .aca-manage-rules { - @include mat.button-overrides( + @include mat.progress-bar-overrides( ( - outlined-outline-color: var(--adf-theme-foreground-text-color-064) + active-indicator-color: var(--theme-primary-color) + ) + ); + @include mat.button-overrides( + ( + outlined-outline-color: var(--adf-theme-foreground-text-color-064), + filled-container-color: var(--theme-primary-color), + filled-label-text-color: var(--theme-primary-color-default-contrast) ) ); - - #{ms.$mat-slide-toggle}:is(mat-slide-toggle) #{ms.$mat-switch}:enabled #{ms.$mat-switch-track}::after { - background: var(--mdc-switch-selected-track-color); - } - - #{ms.$mat-slide-toggle} #{ms.$mat-switch} #{ms.$mat-switch-handle}::before { - background: var(--mdc-switch-selected-pressed-handle-color); - } &__toolbar { color: var(--adf-theme-foreground-text-color-064); height: 64px; font-size: var(--theme-body-1-font-size); white-space: normal; - background-color: inherit; + background-color: var(--theme-background-color); border: none; padding: 0; } + adf-empty-content { + background-color: var(--theme-background-color); + } + &__actions-bar { padding: 0 30px; display: flex; @@ -40,17 +43,53 @@ align-items: center; flex: 1; font-size: var(--theme-body-1-font-size); + + mat-icon { + color: var(--adf-theme-foreground-text-color-054); + } } &__buttons { display: flex; align-items: stretch; gap: 12px; + + @include mat.button-overrides( + ( + filled-horizontal-padding: 16px, + outlined-horizontal-padding: 16px + ) + ); } &__toggle { font-weight: 600; font-size: 14px; + + @include mat.slide-toggle-overrides( + ( + track-width: 36px, + track-height: 20px, + track-shape: 10px, + label-text-tracking: normal, + selected-handle-size: 14px, + unselected-handle-size: 14px, + pressed-handle-size: 14px, + with-icon-handle-size: 14px, + unselected-with-icon-handle-horizontal-margin: 0 3px 0 0, + selected-with-icon-handle-horizontal-margin: 0 0 0 16px, + selected-handle-color: var(--adf-theme-background-card-color), + selected-focus-handle-color: var(--adf-theme-background-card-color), + selected-hover-handle-color: var(--adf-theme-background-card-color), + selected-pressed-handle-color: var(--adf-theme-background-card-color), + selected-icon-color: var(--adf-theme-background-card-color), + handle-surface-color: var(--adf-theme-background-card-color), + unselected-handle-color: var(--adf-theme-foreground-text-color-075), + unselected-focus-handle-color: var(--adf-theme-foreground-text-color-087), + unselected-hover-handle-color: var(--adf-theme-foreground-text-color-087), + unselected-pressed-handle-color: var(--adf-theme-foreground-text-color-087) + ) + ); } &__vertical-divider { @@ -59,6 +98,14 @@ } } + .aca-page-layout-header { + padding: 12px; + + mat-icon { + color: var(--adf-theme-foreground-text-color-087); + } + } + &__container { display: grid; grid-template-columns: minmax(250px, 1fr) 3fr; diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss index 0eef36b97..602208d80 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss @@ -1,4 +1,5 @@ @use '../../styles/mat-selectors' as ms; +@use '@angular/material' as mat; /* stylelint-disable selector-class-pattern */ .aca-rule-action-list { @@ -7,6 +8,14 @@ .aca-rule-action-list-add-action-button { margin: 4px 0 20px; + @include mat.button-overrides( + ( + filled-label-text-color: var(--adf-theme-foreground-base-color), + filled-container-color: transparent, + filled-horizontal-padding: 16px + ) + ); + .aca-rule-action-list-add-action-button-icon { width: 24px; height: 24px; diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss index ab9cad2f3..07deed4d1 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss @@ -9,10 +9,16 @@ gap: 20px; adf-card-view { + margin-top: 0; + .adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem { display: inline-block; width: 100%; + .adf-card-textitem-field-container { + padding-top: 0; + } + .adf-textitem-clickable { padding-top: 0; } diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss index b39c6f0c6..8217be824 100644 --- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss @@ -1,4 +1,5 @@ @use '../../styles/mat-selectors' as ms; +@use '@angular/material' as mat; .aca-rule-composite-condition { display: block; @@ -55,6 +56,13 @@ &__actions { padding-left: 8px; + @include mat.button-overrides( + ( + filled-label-text-color: var(--adf-theme-foreground-base-color), + filled-horizontal-padding: 16px + ) + ); + button:not(:disabled) { background-color: unset; } 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 a4d58b105..10c5a2cd7 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 @@ -50,7 +50,6 @@