From 016e5ec0896e29688af2ab5a7f2c16f2b0f1e7b3 Mon Sep 17 00:00:00 2001 From: Wojciech Duda <69160975+wojd0@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:22:27 +0200 Subject: [PATCH] Revert "[AAE-16369] use layout-bp mixin where applicable" (#8944) --- angular.json | 117 +++--------------- lib/cli/package-lock.json | 116 ++++++++--------- lib/content-services/ng-package.json | 5 +- .../content-user-info.component.scss | 6 +- .../components/document-list.component.scss | 8 +- .../components/search-control.component.scss | 3 +- lib/core/ng-package.json | 5 +- lib/core/shell/ng-package.json | 7 +- .../lib/components/shell/shell.component.scss | 4 +- .../components/form-renderer.component.scss | 6 +- .../identity-user-info.component.scss | 7 +- .../components/header/header.component.scss | 4 +- lib/core/src/lib/styles/_default-class.scss | 6 +- .../error-content.component.scss | 25 ---- lib/extensions/ng-package.json | 5 +- lib/insights/ng-package.json | 5 +- lib/process-services-cloud/ng-package.json | 5 +- .../components/app-list-cloud.component.scss | 6 +- .../edit-process-filter-cloud.component.scss | 4 +- .../start-task-cloud.component.scss | 4 +- ...base-edit-task-filter-cloud.component.scss | 4 +- .../task-header-cloud.component.scss | 4 +- lib/process-services/ng-package.json | 5 +- .../src/lib/app-list/apps-list.component.scss | 6 +- .../process-attachment-list.component.scss | 4 +- .../task-attachment-list.component.scss | 6 +- .../attach-file-widget.component.scss | 4 +- .../components/start-process.component.scss | 4 +- .../process-user-info.component.scss | 6 +- .../components/start-task.component.scss | 8 +- .../components/task-details.component.scss | 4 +- .../components/task-header.component.scss | 4 +- 32 files changed, 110 insertions(+), 297 deletions(-) diff --git a/angular.json b/angular.json index e589bd085c..47dca93ad4 100644 --- a/angular.json +++ b/angular.json @@ -29,7 +29,7 @@ "polyfills": "demo-shell/src/polyfills.ts", "stylePreprocessorOptions": { "includePaths": [ - "lib", "lib/core/src/lib" + "lib" ] }, "assets": [ @@ -272,11 +272,6 @@ "karmaConfig": "lib/core/karma.conf.js", "sourceMap": true, "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - }, "styles": [ "demo-shell/src/styles.scss" ] @@ -312,12 +307,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -338,12 +328,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -425,12 +410,7 @@ "tsConfig": "lib/content-services/tsconfig.spec.json", "karmaConfig": "lib/content-services/karma.conf.js", "sourceMap": true, - "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "codeCoverage": true } }, "lint": { @@ -455,12 +435,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -481,12 +456,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -548,12 +518,7 @@ "tsConfig": "lib/process-services/tsconfig.spec.json", "karmaConfig": "lib/process-services/karma.conf.js", "sourceMap": true, - "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "codeCoverage": true } }, "lint": { @@ -619,12 +584,7 @@ "tsConfig": "lib/process-services-cloud/tsconfig.spec.json", "karmaConfig": "lib/process-services-cloud/karma.conf.js", "sourceMap": true, - "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "codeCoverage": true } }, "lint": { @@ -649,12 +609,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -675,12 +630,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { @@ -753,12 +703,7 @@ "tsConfig": "lib/insights/tsconfig.spec.json", "karmaConfig": "lib/insights/karma.conf.js", "sourceMap": true, - "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "codeCoverage": true } }, "lint": { @@ -823,12 +768,7 @@ "tsConfig": "lib/extensions/tsconfig.spec.json", "karmaConfig": "lib/extensions/karma.conf.js", "sourceMap": true, - "codeCoverage": true, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "codeCoverage": true } }, "lint": { @@ -876,12 +816,7 @@ "entryName": "shared", "entryPath": "/lib/testing/src/lib/shared/index.ts" } - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "production": { @@ -962,12 +897,7 @@ "outputPath": "dist/libs/eslint-plugin-eslint-angular", "main": "lib/eslint-angular/index.ts", "generatePackageJson" : true, - "tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json", - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + "tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json" }, "configurations": { "production": { @@ -1026,12 +956,7 @@ "options": { "commands": [ "cd lib/cli && npm i && npm run dist" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "production": { @@ -1107,11 +1032,6 @@ "browserTarget": "stories:storybook", "configDir": "lib/stories/.storybook", "compodoc": false, - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - }, "styles": [ "demo-shell/src/assets/fonts/muli/muli.css", "demo-shell/src/styles.scss", @@ -1139,12 +1059,7 @@ "demo-shell/src/custom-style-dev.scss", "node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "lib", "lib/core/src/lib" - ] - } + ] }, "configurations": { "ci": { diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json index f256a1ded4..531d0a03f3 100644 --- a/lib/cli/package-lock.json +++ b/lib/cli/package-lock.json @@ -9,7 +9,7 @@ "version": "6.3.0", "license": "Apache-2.0", "dependencies": { - "@alfresco/js-api": ">=6.3.0-1031", + "@alfresco/js-api": ">=6.3.0-1271", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -30,13 +30,13 @@ } }, "node_modules/@alfresco/js-api": { - "version": "6.3.0-1035", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.3.0-1035.tgz", - "integrity": "sha512-+1xjwpx+/+kTlVfbxT1znlGPEfWYPv6KpSNneIz51OH+sFJ030mtkWeU4OnTbgeypSR72BN+G+RMJia7QT6qfA==", + "version": "6.3.0-1280", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.3.0-1280.tgz", + "integrity": "sha512-xRf7YpSe9F9iNnimQS5DnNqCeb1P3EhBRnx/hOsqn9bC20c5plwjJWt2EIMcPvCz1TBhnw24BP14hUR6oq0pdQ==", "dependencies": { "event-emitter": "^0.3.5", - "superagent": "^6.0.0", - "tslib": "^2.0.0" + "superagent": "^8.0.9", + "tslib": "^2.6.1" } }, "node_modules/@types/ejs": { @@ -317,9 +317,9 @@ } }, "node_modules/dezalgo": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", - "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", + "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dependencies": { "asap": "^2.0.0", "wrappy": "1" @@ -475,9 +475,9 @@ } }, "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -488,10 +488,15 @@ } }, "node_modules/formidable": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz", - "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==", - "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz", + "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==", + "dependencies": { + "dezalgo": "^1.0.4", + "hexoid": "^1.0.0", + "once": "^1.4.0", + "qs": "^6.11.0" + }, "funding": { "url": "https://ko-fi.com/tunnckoCore/commissions" } @@ -507,12 +512,13 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { @@ -613,6 +619,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hexoid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", + "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", + "engines": { + "node": ">=8" + } + }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -1034,9 +1048,9 @@ } }, "node_modules/qs": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz", - "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dependencies": { "side-channel": "^1.0.4" }, @@ -1082,19 +1096,6 @@ "npm-normalize-package-bin": "^1.0.0" } }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/readdir-scoped-modules": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", @@ -1358,34 +1359,24 @@ "node": ">=0.10.0" } }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, "node_modules/superagent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-6.1.0.tgz", - "integrity": "sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==", - "deprecated": "Please upgrade to v7.0.2+ of superagent. We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing. See the releases tab for more information at .", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz", + "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==", "dependencies": { "component-emitter": "^1.3.0", - "cookiejar": "^2.1.2", - "debug": "^4.1.1", - "fast-safe-stringify": "^2.0.7", - "form-data": "^3.0.0", - "formidable": "^1.2.2", + "cookiejar": "^2.1.4", + "debug": "^4.3.4", + "fast-safe-stringify": "^2.1.1", + "form-data": "^4.0.0", + "formidable": "^2.1.2", "methods": "^1.1.2", - "mime": "^2.4.6", - "qs": "^6.9.4", - "readable-stream": "^3.6.0", - "semver": "^7.3.2" + "mime": "2.6.0", + "qs": "^6.11.0", + "semver": "^7.3.8" }, "engines": { - "node": ">= 7.0.0" + "node": ">=6.4.0 <13 || >=14" } }, "node_modules/supports-color": { @@ -1420,9 +1411,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -1466,11 +1457,6 @@ "punycode": "^2.1.0" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "node_modules/util-extend": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", diff --git a/lib/content-services/ng-package.json b/lib/content-services/ng-package.json index 8f8e1bec0f..8e55456046 100644 --- a/lib/content-services/ng-package.json +++ b/lib/content-services/ng-package.json @@ -20,9 +20,6 @@ ], "lib": { "entryFile": "src/public-api.ts", - "flatModuleFile": "adf-content-services", - "styleIncludePaths": [ - "../core/src/lib" - ] + "flatModuleFile": "adf-content-services" } } 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 5fa1096b70..0f42de3b16 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-userinfo-container { display: flex; @@ -14,7 +12,7 @@ &-userinfo-name { padding: 0 5px; - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { display: none; } } @@ -96,7 +94,7 @@ display: flex; justify-content: space-between; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { padding: 10px; } } 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 ac36c467e2..ddf62dddb8 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-document-list { min-height: 0; height: 100%; @@ -143,7 +141,7 @@ word-break: break-all; white-space: pre-line; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { font-size: 48px; } } @@ -165,12 +163,12 @@ object-fit: contain; margin-top: 17px; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { width: 250px; } } - @include layout-bp(lt-md) { + @media screen and (max-width: 960px) { &-drag-drop, &-any-files-here-to-add { display: none; diff --git a/lib/content-services/src/lib/search/components/search-control.component.scss b/lib/content-services/src/lib/search/components/search-control.component.scss index 6fb81dce03..c7b1afd089 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.scss +++ b/lib/content-services/src/lib/search/components/search-control.component.scss @@ -1,5 +1,4 @@ @use '@angular/material' as mat; -@import 'styles/flex'; $mat-menu-overlay-min-width: 112px !default; // 56 * 2 $mat-menu-overlay-max-width: 280px !default; // 56 * 5 @@ -24,7 +23,7 @@ $mat-menu-overlay-max-width: 280px !default; // 56 * 5 background-color: var(--adf-theme-background-card-color); border-radius: 2px; - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/lib/core/ng-package.json b/lib/core/ng-package.json index 385e6922c9..45cd8ac6fd 100644 --- a/lib/core/ng-package.json +++ b/lib/core/ng-package.json @@ -35,10 +35,7 @@ ], "lib": { "entryFile": "./src/public-api.ts", - "flatModuleFile": "adf-core", - "styleIncludePaths": [ - "./src/lib" - ] + "flatModuleFile": "adf-core" }, "allowedNonPeerDependencies": [ "cropperjs", diff --git a/lib/core/shell/ng-package.json b/lib/core/shell/ng-package.json index 4478cfc551..1d9f99930d 100644 --- a/lib/core/shell/ng-package.json +++ b/lib/core/shell/ng-package.json @@ -1,9 +1,6 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json", "lib": { - "entryFile": "src/index.ts", - "styleIncludePaths": [ - "../src/lib" - ] + "entryFile": "src/index.ts" } } diff --git a/lib/core/shell/src/lib/components/shell/shell.component.scss b/lib/core/shell/src/lib/components/shell/shell.component.scss index 34c3eb0fec..8373fd4092 100644 --- a/lib/core/shell/src/lib/components/shell/shell.component.scss +++ b/lib/core/shell/src/lib/components/shell/shell.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .app-shell { display: flex; flex-direction: column; @@ -23,7 +21,7 @@ } } -@include layout-bp(lt-sm) { +@media screen and (max-width: 599px) { .adf-app-title { display: none; } 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 5254c61089..6f8f444fa4 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.scss +++ b/lib/core/src/lib/form/components/form-renderer.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-hidden { display: none; } @@ -24,7 +22,7 @@ .adf-container-widget { .adf-grid-list-column-view { - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { display: flow; } @@ -58,7 +56,7 @@ padding-right: 3px; } - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { .adf-grid-list-item { flex: 1 0 100%; } 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 e028e3959d..4088c303ee 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-userinfo-container { display: flex; @@ -13,7 +11,8 @@ &-userinfo-name { padding: 0 5px; - @include layout-bp(lt-md) { + + @media screen and (max-width: 959px) { display: none; } } @@ -95,7 +94,7 @@ display: flex; justify-content: space-between; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { padding: 10px; } } diff --git a/lib/core/src/lib/layout/components/header/header.component.scss b/lib/core/src/lib/layout/components/header/header.component.scss index 76a13cceca..38a4bca467 100644 --- a/lib/core/src/lib/layout/components/header/header.component.scss +++ b/lib/core/src/lib/layout/components/header/header.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - adf-layout-header .mat-toolbar-single-row { color: var(--theme-header-text-color) !important; background-color: var(--theme-primary-color); @@ -52,7 +50,7 @@ adf-layout-header .mat-toolbar-single-row { padding: 0; } - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { .adf-app-logo, .adf-app-title { display: none; diff --git a/lib/core/src/lib/styles/_default-class.scss b/lib/core/src/lib/styles/_default-class.scss index 6118c95946..3afe0b48b9 100644 --- a/lib/core/src/lib/styles/_default-class.scss +++ b/lib/core/src/lib/styles/_default-class.scss @@ -1,13 +1,11 @@ -@import 'styles/flex'; - .adf-hide-small { - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { display: none !important; } } .adf-hide-xsmall { - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { display: none !important; } } diff --git a/lib/core/src/lib/templates/error-content/error-content.component.scss b/lib/core/src/lib/templates/error-content/error-content.component.scss index dbd5769107..2230f48dcf 100644 --- a/lib/core/src/lib/templates/error-content/error-content.component.scss +++ b/lib/core/src/lib/templates/error-content/error-content.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-error-content { color: var(--adf-theme-foreground-text-color-054); display: flex; @@ -32,28 +30,5 @@ width: 50%; min-width: 250px; margin-bottom: 60px; - line-height: 30px; - } -} - -@include layout-bp(lt-md) { - .adf-error-content { - &-code { - margin-top: 100px; - font-size: 50px; - margin-bottom: 25px; - } - - &-shadow { - width: 100px; - } - - &-title { - font-size: var(--theme-headline-font-size); - } - - &-description { - font-size: var(--theme-subheading-2-font-size); - } } } diff --git a/lib/extensions/ng-package.json b/lib/extensions/ng-package.json index c542c46ef6..8b677dfab5 100644 --- a/lib/extensions/ng-package.json +++ b/lib/extensions/ng-package.json @@ -4,9 +4,6 @@ "deleteDestPath": false, "lib": { "entryFile": "src/public-api.ts", - "flatModuleFile": "adf-extensions", - "styleIncludePaths": [ - "../../dist/libs/core/src/lib" - ] + "flatModuleFile": "adf-extensions" } } diff --git a/lib/insights/ng-package.json b/lib/insights/ng-package.json index 5f990d0158..5600d2ce08 100644 --- a/lib/insights/ng-package.json +++ b/lib/insights/ng-package.json @@ -15,9 +15,6 @@ ], "lib": { "entryFile": "src/public-api.ts", - "flatModuleFile": "adf-insights", - "styleIncludePaths": [ - "../../dist/libs/core/lib" - ] + "flatModuleFile": "adf-insights" } } diff --git a/lib/process-services-cloud/ng-package.json b/lib/process-services-cloud/ng-package.json index 92fd9ace75..77936a8af6 100644 --- a/lib/process-services-cloud/ng-package.json +++ b/lib/process-services-cloud/ng-package.json @@ -21,10 +21,7 @@ "lib": { "entryFile": "src/public-api.ts", - "flatModuleFile": "adf-process-services-cloud", - "styleIncludePaths": [ - "../../dist/libs/core/lib" - ] + "flatModuleFile": "adf-process-services-cloud" }, "allowedNonPeerDependencies": [ "@apollo/client", diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss index 9dc9e7f2be..457b5fc4af 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - adf-cloud-app-list { width: 100%; @@ -29,11 +27,11 @@ adf-cloud-app-list { flex: 1 1 100%; max-width: 33.3333%; - @include layout-bp(lt-md) { + @media screen and (max-width: 960px) { max-width: 50%; } - @include layout-bp(lt-sm) { + @media screen and (max-width: 600px) { max-width: 100%; } } diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.scss b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.scss index 4d10f5dc51..e81e209b48 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-edit-process-filter-date-error-container { position: absolute; height: 20px; @@ -50,7 +48,7 @@ max-width: 23%; } - @include layout-bp(lt-sm) { + @media screen and (max-width: 600px) { flex-flow: column; :not(:last-child) { diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss index 2223dfed5e..15108a3ce6 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-cloud-start-task-heading { border-bottom: 1px solid var(--adf-theme-foreground-divider-color); margin-bottom: 10px; @@ -85,7 +83,7 @@ adf-cloud-start-task { } } - @include layout-bp(lt-md) { + @media screen and (max-width: 960px) { flex-direction: column; mat-form-field, diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.scss b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.scss index 012b777547..04c7ec9235 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-edit-task-filter-checkbox { font-size: var(--theme-subheading-2-font-size); padding-top: 10px; @@ -60,7 +58,7 @@ flex: 1 1 23%; } - @include layout-bp(lt-sm) { + @media screen and (max-width: 600px) { flex-flow: column; :not(:last-child) { diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss index d5a428118b..2f11070632 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-controls { display: flex; @@ -28,7 +26,7 @@ } } -@include layout-bp(lt-md) { +@media screen and (max-width: 959px) { adf-card-view .adf-property-value { text-overflow: ellipsis; overflow: hidden; diff --git a/lib/process-services/ng-package.json b/lib/process-services/ng-package.json index a51516c44a..f9fe1c857f 100644 --- a/lib/process-services/ng-package.json +++ b/lib/process-services/ng-package.json @@ -20,9 +20,6 @@ ], "lib": { "entryFile": "src/public-api.ts", - "flatModuleFile": "adf-process-services", - "styleIncludePaths": [ - "../core/src/lib" - ] + "flatModuleFile": "adf-process-services" } } diff --git a/lib/process-services/src/lib/app-list/apps-list.component.scss b/lib/process-services/src/lib/app-list/apps-list.component.scss index b0931310ba..4561d2ab69 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.scss +++ b/lib/process-services/src/lib/app-list/apps-list.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - /* stylelint-disable scss/no-global-function-names */ @mixin adf-line-clamp($line-height: 1.25, $lines: 3) { position: relative; @@ -68,12 +66,12 @@ $tile-themes: ( flex: 1 1 33.3333%; max-width: 33.3333%; - @include layout-bp(lt-md) { + @media screen and (max-width: 960px) { flex: 1 1 50%; max-width: 50%; } - @include layout-bp(lt-sm) { + @media screen and (max-width: 600px) { flex: 1 1 100%; max-width: 100%; } diff --git a/lib/process-services/src/lib/attachment/process-attachment-list.component.scss b/lib/process-services/src/lib/attachment/process-attachment-list.component.scss index 964aad4e39..0d92d9621c 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list.component.scss +++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf-data-cell { cursor: pointer !important; } @@ -45,7 +43,7 @@ object-fit: contain; margin-top: 17px; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { width: 250px; } } diff --git a/lib/process-services/src/lib/attachment/task-attachment-list.component.scss b/lib/process-services/src/lib/attachment/task-attachment-list.component.scss index a5dd4ad0dd..384427ce23 100644 --- a/lib/process-services/src/lib/attachment/task-attachment-list.component.scss +++ b/lib/process-services/src/lib/attachment/task-attachment-list.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - adf-datatable .adf-data-cell { cursor: pointer !important; } @@ -27,7 +25,7 @@ adf-datatable .adf-data-cell { word-break: break-all; white-space: pre-line; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { font-size: 40px; } } @@ -50,7 +48,7 @@ adf-datatable .adf-data-cell { object-fit: contain; margin-top: 17px; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { width: 250px; } } 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 72f2201e88..24b8bdac46 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-attach-widget-container { margin-bottom: 15px; @@ -74,7 +72,7 @@ max-width: 200px; } - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { .mat-list-text { max-width: 150px; } diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.scss b/lib/process-services/src/lib/process-list/components/start-process.component.scss index 3c869ed94e..2d80d8b6fb 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.scss +++ b/lib/process-services/src/lib/process-list/components/start-process.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-start-process { width: 96%; @@ -73,7 +71,7 @@ } } -@include layout-bp(lt-sm) { +@media (max-width: 600px) { .adf-start-process { width: 90%; margin-left: auto; 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 5fa1096b70..0f42de3b16 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-userinfo-container { display: flex; @@ -14,7 +12,7 @@ &-userinfo-name { padding: 0 5px; - @include layout-bp(lt-md) { + @media screen and (max-width: 959px) { display: none; } } @@ -96,7 +94,7 @@ display: flex; justify-content: space-between; - @include layout-bp(lt-sm) { + @media screen and (max-width: 599px) { padding: 10px; } } 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 85eb027b29..ffa00e25f8 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - /* stylelint-disable no-descending-specificity */ .adf-new-task-heading { padding-top: 12px; @@ -30,11 +28,11 @@ } .input-row { - @include layout-bp(lt-md) { + @media screen and (max-width: 960px){ flex-direction: column; } - @include layout-bp(lt-md) { + @media screen and (min-width: 960px) { mat-form-field { margin-right: 20px; } @@ -46,7 +44,7 @@ box-sizing: border-box; max-width: 48%; - @include layout-bp(lt-sm) { + @media screen and (max-width: 600px){ max-width: 100%; } } 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 a41d467829..42a94867c6 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 @@ -1,5 +1,3 @@ -@import 'styles/flex'; - adf-task-details { width: 100%; @@ -54,7 +52,7 @@ adf-task-details { &-sidebar { &-drawer { - @include layout-bp(lt-lg) { + @media screen and (max-width: 1279px) { margin-left: 0; } } diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.scss b/lib/process-services/src/lib/task-list/components/task-header.component.scss index 0b4fc431e9..5926950f50 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.scss +++ b/lib/process-services/src/lib/task-list/components/task-header.component.scss @@ -1,5 +1,3 @@ -@import 'styles/flex'; - .adf { &-controls { display: flex; @@ -27,7 +25,7 @@ } } -@include layout-bp(lt-md) { +@media screen and (max-width: 959px) { adf-card-view .adf-property-value { text-overflow: ellipsis; overflow: hidden;