From 8d73cc17943e7efe1c7d624276b1b73c844e6968 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 22 Feb 2022 12:27:13 +0000 Subject: [PATCH] [AAE-7501] Fix SCSS deprecation warnings (#7519) * update package lock * update CLI lock file * fix scss deprecations * reduce calculations in styles --- lib/cli/package-lock.json | 12 ++++++------ .../components/datatable/datatable.component.scss | 4 ++-- .../widgets/dynamic-table/dynamic-table.widget.scss | 4 ++-- .../info-drawer/info-drawer-layout.component.scss | 5 +++-- package-lock.json | 6 +++--- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json index 67db103c3d..55900bf817 100644 --- a/lib/cli/package-lock.json +++ b/lib/cli/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@alfresco/js-api": { - "version": "4.8.0-4074", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.8.0-4074.tgz", - "integrity": "sha512-TJiQoB6Eb/vO1qPi1BUZhG1iEvKiCBy/33kMjhVVBndSESPvPkGcPvfxVj25dXfl6NTxadb69uKhybi32lD/sQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.8.0.tgz", + "integrity": "sha512-QEubgUYWNSOkK/tHvoERkTarahm4WST4t0JkbUTUhKAJaCxyaSX6DFg2ZZxBEzwgWZlVYtTbf5k43OGjbRpkbg==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", @@ -535,9 +535,9 @@ }, "dependencies": { "type": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", - "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", + "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" } } }, diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss index d99177ebac..7836a26930 100644 --- a/lib/core/datatable/components/datatable/datatable.component.scss +++ b/lib/core/datatable/components/datatable/datatable.component.scss @@ -6,9 +6,9 @@ $data-table-header-font-size: var(--theme-caption-font-size) !default; $data-table-header-sort-icon-size: var(--theme-subheading-2-font-size) !default; $data-table-row-height: var(--theme-display-3-font-size) !default; $data-table-column-spacing: 36px !default; -$data-table-column-padding: $data-table-column-spacing / 2; +$data-table-column-padding: 18px !default; $data-table-card-padding: var(--theme-headline-line-height) !default; -$data-table-cell-top: $data-table-card-padding / 2; +$data-table-cell-top: calc($data-table-card-padding / 2); $data-table-thumbnail-width: 50px !default; $data-table-cell-min-width: 50px !default; $data-table-cell-min-width-no-grow: 100px !default; diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss index 2d7829d0d3..31e95c8614 100644 --- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss +++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss @@ -9,9 +9,9 @@ $dynamic-table-hover-color: #eee !default; $dynamic-table-selection-color: #e0f7fa !default; $dynamic-table-row-height: 56px !default; $dynamic-table-column-spacing: 36px !default; -$dynamic-table-column-padding: $dynamic-table-column-spacing / 2; +$dynamic-table-column-padding: 18px !default; $dynamic-table-card-padding: 24px !default; -$dynamic-table-cell-top: $dynamic-table-card-padding / 2; +$dynamic-table-cell-top: 12px !default; $dynamic-table-drag-border: 1px dashed rgb(68, 138, 255); dynamic-table-widget .adf-label { diff --git a/lib/core/info-drawer/info-drawer-layout.component.scss b/lib/core/info-drawer/info-drawer-layout.component.scss index 56682c3fef..ee0065d223 100644 --- a/lib/core/info-drawer/info-drawer-layout.component.scss +++ b/lib/core/info-drawer/info-drawer-layout.component.scss @@ -2,6 +2,7 @@ $adf-info-drawer-layout-title-font-size: var(--theme-title-font-size) !default; $adf-info-drawer-icon-size: 48px !default; +$adf-info-drawer-icon-size-half: 24px !default; .adf { &-info-drawer { @@ -75,7 +76,7 @@ $adf-info-drawer-icon-size: 48px !default; .adf-manage-versions-empty, .adf-manage-versions-no-permission { margin: 0; - padding: $adf-info-drawer-icon-size / 2; + padding: $adf-info-drawer-icon-size-half; color: var(--theme-text-color); text-align: center; display: flex; @@ -85,7 +86,7 @@ $adf-info-drawer-icon-size: 48px !default; width: $adf-info-drawer-icon-size; height: $adf-info-drawer-icon-size; font-size: $adf-info-drawer-icon-size; - margin: 0 auto $adf-info-drawer-icon-size / 2; + margin: 0 auto $adf-info-drawer-icon-size-half; display: block; } } diff --git a/package-lock.json b/package-lock.json index 98fd45cda5..918d0ac320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30722,9 +30722,9 @@ } }, "eslint-plugin-unicorn": { - "version": "40.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz", - "integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==", + "version": "41.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-41.0.0.tgz", + "integrity": "sha512-xoJCaRc1uy5REg9DkVga1BkZV57jJxoqOcrU28QHZB89Lk5LdSqdVyTIt9JQVfHNKaiyJ7X+3iLlIn+VEHWEzA==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.15.7",