From 0f0ba1f1b8f8ef9c7d148a2b1032bcba1ee5c0a3 Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Thu, 19 Dec 2024 10:11:43 +0300 Subject: [PATCH 1/2] Deprecation Warning: Sass @import rules --- .../src/components/button.scss | 2 +- .../src/components/carry-forward-panel.scss | 2 +- .../src/components/creator.scss | 18 ++++----- .../src/components/header/logo-image.scss | 2 +- .../src/components/image-item-value.scss | 2 +- .../src/components/item-value.scss | 2 +- .../src/components/link-value.scss | 2 +- .../src/components/list.scss | 2 +- .../src/components/matrix-cell.scss | 2 +- .../src/components/notifier.scss | 2 +- .../page-navigator/page-navigator-item.scss | 2 +- .../page-navigator/page-navigator.scss | 2 +- .../src/components/page.scss | 2 +- .../src/components/popup.scss | 2 + .../property-panel/property-panel-item.scss | 2 +- .../property-panel/property-panel.scss | 2 +- .../src/components/question-dropdown.scss | 3 +- .../src/components/question-image.scss | 2 +- .../src/components/question-rating.scss | 2 +- .../src/components/question.scss | 4 +- .../src/components/results.scss | 2 +- .../src/components/row.scss | 2 +- .../src/components/scroll.scss | 2 +- .../src/components/search.scss | 2 +- .../src/components/side-bar/side-bar.scss | 2 +- .../src/components/side-bar/tab-control.scss | 2 +- .../src/components/simulator.scss | 2 +- .../src/components/string-editor.scss | 2 +- .../src/components/surface-placeholder.scss | 2 +- .../src/components/switcher/switcher.scss | 2 +- .../tabbed-menu/tabbed-menu-item.scss | 2 +- .../components/tabbed-menu/tabbed-menu.scss | 2 +- .../src/components/tabs/designer.scss | 2 +- .../src/components/tabs/json-editor-ace.scss | 2 +- .../components/tabs/json-editor-textarea.scss | 2 +- .../src/components/tabs/logic-ui.scss | 2 +- .../src/components/tabs/logic.scss | 4 +- .../src/components/tabs/test.scss | 2 +- .../src/components/tabs/translation.scss | 2 +- .../components/toolbox/toolbox-animation.scss | 2 +- .../src/components/toolbox/toolbox-right.scss | 2 +- .../components/toolbox/toolbox-search.scss | 2 +- .../src/components/toolbox/toolbox-tool.scss | 4 +- .../src/components/toolbox/toolbox.scss | 2 +- .../src/creator-theme/action-button.scss | 2 + .../src/creator-theme/button.scss | 2 + .../src/creator-theme/creator.scss | 5 +-- .../src/ctr-font-sizes.scss | 2 + .../survey-creator-core/src/ctr-sizes.scss | 2 + .../src/ctr-variables.scss | 19 +++++----- .../src/custom-questions/boolean-switch.scss | 2 +- .../src/lbr-font-sizes.scss | 2 + .../survey-creator-core/src/lbr-sizes.scss | 2 + .../src/lbr-variables.scss | 10 +++-- .../blocks/spg-action-bar.scss | 2 + .../blocks/spg-buttongroup.scss | 2 + .../blocks/spg-checkbox.scss | 2 + .../blocks/spg-color-editor.scss | 2 + .../blocks/spg-comment.scss | 2 + .../blocks/spg-dropdown.scss | 2 + .../property-grid-theme/blocks/spg-input.scss | 2 + .../property-grid-theme/blocks/spg-link.scss | 2 + .../blocks/spg-matrixdynamic.scss | 2 + .../property-grid-theme/blocks/spg-panel.scss | 3 ++ .../blocks/spg-question-group.scss | 2 + .../blocks/spg-question.scss | 2 + .../blocks/spg-search-editor.scss | 3 +- .../property-grid-theme/blocks/spg-table.scss | 3 ++ .../blocks/spg-theme-builder.scss | 2 + .../property-grid-theme/property-grid.scss | 37 +++++++++---------- .../survey-creator-core/src/responsivity.scss | 2 +- .../src/utils/context-button.scss | 2 +- .../survey-creator-core/src/utils/layout.scss | 2 +- .../src/variables-layer.scss | 2 +- .../survey-creator-core/src/variables.scss | 4 +- 75 files changed, 143 insertions(+), 98 deletions(-) diff --git a/packages/survey-creator-core/src/components/button.scss b/packages/survey-creator-core/src/components/button.scss index 90822efcfa..616c625904 100644 --- a/packages/survey-creator-core/src/components/button.scss +++ b/packages/survey-creator-core/src/components/button.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-creator-popup.sv-popup--modal { .sd-btn.sv-popup__button { diff --git a/packages/survey-creator-core/src/components/carry-forward-panel.scss b/packages/survey-creator-core/src/components/carry-forward-panel.scss index b02b5513fc..7736999b67 100644 --- a/packages/survey-creator-core/src/components/carry-forward-panel.scss +++ b/packages/survey-creator-core/src/components/carry-forward-panel.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-carry-forward-panel-wrapper { width: 100%; diff --git a/packages/survey-creator-core/src/components/creator.scss b/packages/survey-creator-core/src/components/creator.scss index 01b820b5c4..6a1bfa65c6 100644 --- a/packages/survey-creator-core/src/components/creator.scss +++ b/packages/survey-creator-core/src/components/creator.scss @@ -1,12 +1,12 @@ -@import "../variables.scss"; -@import "./notifier.scss"; -@import "./popup.scss"; -@import "./button.scss"; -@import "./surface-placeholder.scss"; -@import "../lbr-font-sizes.scss"; -@import "../lbr-sizes.scss"; -@import "../ctr-font-sizes.scss"; -@import "../ctr-sizes.scss"; +@use "../variables" as *; +@forward "./notifier.scss"; +@forward "./popup.scss"; +@forward "./button.scss"; +@forward "./surface-placeholder.scss"; +@forward "../lbr-font-sizes.scss"; +@forward "../lbr-sizes.scss"; +@forward "../ctr-font-sizes.scss"; +@forward "../ctr-sizes.scss"; survey-creator, .svc-creator { diff --git a/packages/survey-creator-core/src/components/header/logo-image.scss b/packages/survey-creator-core/src/components/header/logo-image.scss index eea6c3e389..8888932075 100644 --- a/packages/survey-creator-core/src/components/header/logo-image.scss +++ b/packages/survey-creator-core/src/components/header/logo-image.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-designer-header .sd-container-modern__title { gap: 0; diff --git a/packages/survey-creator-core/src/components/image-item-value.scss b/packages/survey-creator-core/src/components/image-item-value.scss index 475b2e055f..f8b28bfa22 100644 --- a/packages/survey-creator-core/src/components/image-item-value.scss +++ b/packages/survey-creator-core/src/components/image-item-value.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-image-item-value-wrapper { display: inline-block; diff --git a/packages/survey-creator-core/src/components/item-value.scss b/packages/survey-creator-core/src/components/item-value.scss index 0c0e39c024..e06d666797 100644 --- a/packages/survey-creator-core/src/components/item-value.scss +++ b/packages/survey-creator-core/src/components/item-value.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-item-value-wrapper { position: relative; diff --git a/packages/survey-creator-core/src/components/link-value.scss b/packages/survey-creator-core/src/components/link-value.scss index 584c2f5751..de6c3b8034 100644 --- a/packages/survey-creator-core/src/components/link-value.scss +++ b/packages/survey-creator-core/src/components/link-value.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-link__button { @include ctrDefaultBoldFont; diff --git a/packages/survey-creator-core/src/components/list.scss b/packages/survey-creator-core/src/components/list.scss index 61a34bbf0e..93fd292a59 100644 --- a/packages/survey-creator-core/src/components/list.scss +++ b/packages/survey-creator-core/src/components/list.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-list { width: 100%; diff --git a/packages/survey-creator-core/src/components/matrix-cell.scss b/packages/survey-creator-core/src/components/matrix-cell.scss index 7267a2c788..56f1428e65 100644 --- a/packages/survey-creator-core/src/components/matrix-cell.scss +++ b/packages/survey-creator-core/src/components/matrix-cell.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; // .svc-question__content { // .sd-table { diff --git a/packages/survey-creator-core/src/components/notifier.scss b/packages/survey-creator-core/src/components/notifier.scss index 1277f4af02..347550a168 100644 --- a/packages/survey-creator-core/src/components/notifier.scss +++ b/packages/survey-creator-core/src/components/notifier.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-notifier.svc-notifier--shown { visibility: visible; diff --git a/packages/survey-creator-core/src/components/page-navigator/page-navigator-item.scss b/packages/survey-creator-core/src/components/page-navigator/page-navigator-item.scss index 6fa2b1436e..fb71ea4f03 100644 --- a/packages/survey-creator-core/src/components/page-navigator/page-navigator-item.scss +++ b/packages/survey-creator-core/src/components/page-navigator/page-navigator-item.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-page-navigator-item, .svc-page-navigator-item { diff --git a/packages/survey-creator-core/src/components/page-navigator/page-navigator.scss b/packages/survey-creator-core/src/components/page-navigator/page-navigator.scss index 1f804ae8d9..d2c2054d92 100644 --- a/packages/survey-creator-core/src/components/page-navigator/page-navigator.scss +++ b/packages/survey-creator-core/src/components/page-navigator/page-navigator.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-page-navigator, .svc-page-navigator { diff --git a/packages/survey-creator-core/src/components/page.scss b/packages/survey-creator-core/src/components/page.scss index ab228e6951..a77f0003c2 100644 --- a/packages/survey-creator-core/src/components/page.scss +++ b/packages/survey-creator-core/src/components/page.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; svc-page { display: block; diff --git a/packages/survey-creator-core/src/components/popup.scss b/packages/survey-creator-core/src/components/popup.scss index eaf1c46ee1..100381ca73 100644 --- a/packages/survey-creator-core/src/components/popup.scss +++ b/packages/survey-creator-core/src/components/popup.scss @@ -1,3 +1,5 @@ +@use "../variables" as *; + .svc-creator-popup { &.sv-popup--modal { background-color: var(--ctr-popup-haze-background-color, $background-semitransparent); diff --git a/packages/survey-creator-core/src/components/property-panel/property-panel-item.scss b/packages/survey-creator-core/src/components/property-panel/property-panel-item.scss index db909f553a..54c61023f2 100644 --- a/packages/survey-creator-core/src/components/property-panel/property-panel-item.scss +++ b/packages/survey-creator-core/src/components/property-panel/property-panel-item.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-property-panel__item { margin: calcSize(2) 0; diff --git a/packages/survey-creator-core/src/components/property-panel/property-panel.scss b/packages/survey-creator-core/src/components/property-panel/property-panel.scss index 2fd6fbe959..64c90a6539 100644 --- a/packages/survey-creator-core/src/components/property-panel/property-panel.scss +++ b/packages/survey-creator-core/src/components/property-panel/property-panel.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-property-grid-placeholder { display: flex; diff --git a/packages/survey-creator-core/src/components/question-dropdown.scss b/packages/survey-creator-core/src/components/question-dropdown.scss index 0d44e584fe..e901b19e15 100644 --- a/packages/survey-creator-core/src/components/question-dropdown.scss +++ b/packages/survey-creator-core/src/components/question-dropdown.scss @@ -1,5 +1,4 @@ -@import "../variables.scss"; - +@use "../variables" as *; .svc-question__dropdown-choices { margin-top: calcSize(2); diff --git a/packages/survey-creator-core/src/components/question-image.scss b/packages/survey-creator-core/src/components/question-image.scss index 6144e331f6..f81e0337f8 100644 --- a/packages/survey-creator-core/src/components/question-image.scss +++ b/packages/survey-creator-core/src/components/question-image.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-image-question-controls { position: absolute; diff --git a/packages/survey-creator-core/src/components/question-rating.scss b/packages/survey-creator-core/src/components/question-rating.scss index d03074bd70..a6946c40b7 100644 --- a/packages/survey-creator-core/src/components/question-rating.scss +++ b/packages/survey-creator-core/src/components/question-rating.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-rating-question-controls { position: absolute; diff --git a/packages/survey-creator-core/src/components/question.scss b/packages/survey-creator-core/src/components/question.scss index a59b486e96..a3816d76ab 100644 --- a/packages/survey-creator-core/src/components/question.scss +++ b/packages/survey-creator-core/src/components/question.scss @@ -1,5 +1,5 @@ -@import "../variables.scss"; -@import "./carry-forward-panel.scss"; +@use "../variables" as *; +@use "./carry-forward-panel.scss" as *; svc-question { display: block; diff --git a/packages/survey-creator-core/src/components/results.scss b/packages/survey-creator-core/src/components/results.scss index f8617c4b88..b43b1272dd 100644 --- a/packages/survey-creator-core/src/components/results.scss +++ b/packages/survey-creator-core/src/components/results.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svd-test-results { border-radius: 4px; diff --git a/packages/survey-creator-core/src/components/row.scss b/packages/survey-creator-core/src/components/row.scss index b3580f4e0b..4ae2332a58 100644 --- a/packages/survey-creator-core/src/components/row.scss +++ b/packages/survey-creator-core/src/components/row.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-row { width: 100%; diff --git a/packages/survey-creator-core/src/components/scroll.scss b/packages/survey-creator-core/src/components/scroll.scss index 18ca10bb92..ec8cfaa6bf 100644 --- a/packages/survey-creator-core/src/components/scroll.scss +++ b/packages/survey-creator-core/src/components/scroll.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-scroll__wrapper { position: relative; diff --git a/packages/survey-creator-core/src/components/search.scss b/packages/survey-creator-core/src/components/search.scss index 8ee48a40bc..0897b09335 100644 --- a/packages/survey-creator-core/src/components/search.scss +++ b/packages/survey-creator-core/src/components/search.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-search { // TODO remove v2 --sjs-general-forecolor: rgba(0, 0, 0, 0.91); diff --git a/packages/survey-creator-core/src/components/side-bar/side-bar.scss b/packages/survey-creator-core/src/components/side-bar/side-bar.scss index 3584655645..791d272429 100644 --- a/packages/survey-creator-core/src/components/side-bar/side-bar.scss +++ b/packages/survey-creator-core/src/components/side-bar/side-bar.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; $side-bar-enter-duration: var(--svc-side-bar-enter-duration, 500ms); $side-bar-leave-duration: var(--svc-side-bar-leave-duration, 500ms); diff --git a/packages/survey-creator-core/src/components/side-bar/tab-control.scss b/packages/survey-creator-core/src/components/side-bar/tab-control.scss index ffd05e0329..394173aefe 100644 --- a/packages/survey-creator-core/src/components/side-bar/tab-control.scss +++ b/packages/survey-creator-core/src/components/side-bar/tab-control.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-sidebar-tabs { display: flex; diff --git a/packages/survey-creator-core/src/components/simulator.scss b/packages/survey-creator-core/src/components/simulator.scss index 5ac69322a7..763e107b3f 100644 --- a/packages/survey-creator-core/src/components/simulator.scss +++ b/packages/survey-creator-core/src/components/simulator.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svd-simulator { position: relative; diff --git a/packages/survey-creator-core/src/components/string-editor.scss b/packages/survey-creator-core/src/components/string-editor.scss index 64447ce273..b92b0a4103 100644 --- a/packages/survey-creator-core/src/components/string-editor.scss +++ b/packages/survey-creator-core/src/components/string-editor.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .sd-element__header { .svc-string-editor { diff --git a/packages/survey-creator-core/src/components/surface-placeholder.scss b/packages/survey-creator-core/src/components/surface-placeholder.scss index d3ed0da7f3..e9b5596a0e 100644 --- a/packages/survey-creator-core/src/components/surface-placeholder.scss +++ b/packages/survey-creator-core/src/components/surface-placeholder.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-surface-placeholder { display: flex; diff --git a/packages/survey-creator-core/src/components/switcher/switcher.scss b/packages/survey-creator-core/src/components/switcher/switcher.scss index 3f3ba4ce59..2226e49304 100644 --- a/packages/survey-creator-core/src/components/switcher/switcher.scss +++ b/packages/survey-creator-core/src/components/switcher/switcher.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-switcher.spg-action-button { align-items: center; diff --git a/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu-item.scss b/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu-item.scss index 92d785d39d..80a9fcae3a 100644 --- a/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu-item.scss +++ b/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu-item.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-tabbed-menu-item { display: flex; diff --git a/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu.scss b/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu.scss index 38c28f75dd..0117ecac9e 100644 --- a/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu.scss +++ b/packages/survey-creator-core/src/components/tabbed-menu/tabbed-menu.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-tabbed-menu { display: flex; diff --git a/packages/survey-creator-core/src/components/tabs/designer.scss b/packages/survey-creator-core/src/components/tabs/designer.scss index 95af01d4cc..d112aac48e 100644 --- a/packages/survey-creator-core/src/components/tabs/designer.scss +++ b/packages/survey-creator-core/src/components/tabs/designer.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-tab-designer { width: 100%; diff --git a/packages/survey-creator-core/src/components/tabs/json-editor-ace.scss b/packages/survey-creator-core/src/components/tabs/json-editor-ace.scss index 82321e403c..33ca5a9578 100644 --- a/packages/survey-creator-core/src/components/tabs/json-editor-ace.scss +++ b/packages/survey-creator-core/src/components/tabs/json-editor-ace.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-tab-json-editor-ace { width: 100%; diff --git a/packages/survey-creator-core/src/components/tabs/json-editor-textarea.scss b/packages/survey-creator-core/src/components/tabs/json-editor-textarea.scss index 632314f631..00d48eb9c2 100644 --- a/packages/survey-creator-core/src/components/tabs/json-editor-textarea.scss +++ b/packages/survey-creator-core/src/components/tabs/json-editor-textarea.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-tab-json-editor-textarea { width: 100%; diff --git a/packages/survey-creator-core/src/components/tabs/logic-ui.scss b/packages/survey-creator-core/src/components/tabs/logic-ui.scss index e16129d853..66fa65df7d 100644 --- a/packages/survey-creator-core/src/components/tabs/logic-ui.scss +++ b/packages/survey-creator-core/src/components/tabs/logic-ui.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-tab-logic-edit { width: 100%; diff --git a/packages/survey-creator-core/src/components/tabs/logic.scss b/packages/survey-creator-core/src/components/tabs/logic.scss index b902b82a40..c2ecb39c19 100644 --- a/packages/survey-creator-core/src/components/tabs/logic.scss +++ b/packages/survey-creator-core/src/components/tabs/logic.scss @@ -1,5 +1,5 @@ -@import "../../variables.scss"; -@import "../../colors.scss"; +@use "../../variables" as *; +@use "../../colors.scss" as *; .sl-table { width: 50%; diff --git a/packages/survey-creator-core/src/components/tabs/test.scss b/packages/survey-creator-core/src/components/tabs/test.scss index 99872e9b2d..f6f76b3a0d 100644 --- a/packages/survey-creator-core/src/components/tabs/test.scss +++ b/packages/survey-creator-core/src/components/tabs/test.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; svc-tab-test { width: 100%; diff --git a/packages/survey-creator-core/src/components/tabs/translation.scss b/packages/survey-creator-core/src/components/tabs/translation.scss index 846f8670cf..41a4d1699e 100644 --- a/packages/survey-creator-core/src/components/tabs/translation.scss +++ b/packages/survey-creator-core/src/components/tabs/translation.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-tab-translation { width: 100%; diff --git a/packages/survey-creator-core/src/components/toolbox/toolbox-animation.scss b/packages/survey-creator-core/src/components/toolbox/toolbox-animation.scss index fb1a8dae3d..d9f613506f 100644 --- a/packages/survey-creator-core/src/components/toolbox/toolbox-animation.scss +++ b/packages/survey-creator-core/src/components/toolbox/toolbox-animation.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; $svc-toolbox-fade-in-duration: var(--sjs-svc-toolbox-fade-in-duration, 250ms); $svc-toolbox-move-in-duration: var(--sjs-svc-toolbox-move-in-duration, 250ms); $svc-toolbox-fade-in-delay: var(--sjs-svc-toolbox-fade-in-delay, 100ms); diff --git a/packages/survey-creator-core/src/components/toolbox/toolbox-right.scss b/packages/survey-creator-core/src/components/toolbox/toolbox-right.scss index 87d925e384..a689fd60d8 100644 --- a/packages/survey-creator-core/src/components/toolbox/toolbox-right.scss +++ b/packages/survey-creator-core/src/components/toolbox/toolbox-right.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-creator__toolbox--right, [dir="rtl"], [style*="direction:rtl"], diff --git a/packages/survey-creator-core/src/components/toolbox/toolbox-search.scss b/packages/survey-creator-core/src/components/toolbox/toolbox-search.scss index 6a682fa328..30069e02ce 100644 --- a/packages/survey-creator-core/src/components/toolbox/toolbox-search.scss +++ b/packages/survey-creator-core/src/components/toolbox/toolbox-search.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-toolbox { .svc-search { diff --git a/packages/survey-creator-core/src/components/toolbox/toolbox-tool.scss b/packages/survey-creator-core/src/components/toolbox/toolbox-tool.scss index 32e1e0af7a..cce525eb83 100644 --- a/packages/survey-creator-core/src/components/toolbox/toolbox-tool.scss +++ b/packages/survey-creator-core/src/components/toolbox/toolbox-tool.scss @@ -1,5 +1,5 @@ -@import "../../variables.scss"; -@import "../../variables-layer.scss"; +@use "../../variables" as *; +@use "../../variables-layer.scss" as *; .svc-toolbox__item { display: flex; diff --git a/packages/survey-creator-core/src/components/toolbox/toolbox.scss b/packages/survey-creator-core/src/components/toolbox/toolbox.scss index 9fc7bc6089..57505c89b4 100644 --- a/packages/survey-creator-core/src/components/toolbox/toolbox.scss +++ b/packages/survey-creator-core/src/components/toolbox/toolbox.scss @@ -1,4 +1,4 @@ -@import "../../variables.scss"; +@use "../../variables" as *; .svc-toolbox { --dft-toolbox-item-padding-top: calc(1 * #{$base-unit}); diff --git a/packages/survey-creator-core/src/creator-theme/action-button.scss b/packages/survey-creator-core/src/creator-theme/action-button.scss index 08371cfe72..8ffa43d0be 100644 --- a/packages/survey-creator-core/src/creator-theme/action-button.scss +++ b/packages/survey-creator-core/src/creator-theme/action-button.scss @@ -1,3 +1,5 @@ +@use "../variables" as *; + .svc-action-button { @include ctrDefaultBoldFont; display: inline-block; diff --git a/packages/survey-creator-core/src/creator-theme/button.scss b/packages/survey-creator-core/src/creator-theme/button.scss index 69c86bc7d5..4dc6178c88 100644 --- a/packages/survey-creator-core/src/creator-theme/button.scss +++ b/packages/survey-creator-core/src/creator-theme/button.scss @@ -1,3 +1,5 @@ +@use "../variables" as *; + .svc-btn { display: flex; padding: var(--ctr-button-padding-vertical, calcSize(2)) var(--ctr-button-padding-horizontal, calcSize(6)); diff --git a/packages/survey-creator-core/src/creator-theme/creator.scss b/packages/survey-creator-core/src/creator-theme/creator.scss index 2498063d5c..749e2fdfef 100644 --- a/packages/survey-creator-core/src/creator-theme/creator.scss +++ b/packages/survey-creator-core/src/creator-theme/creator.scss @@ -1,3 +1,2 @@ -@import "../variables.scss"; -@import "./button.scss"; -@import "./action-button.scss"; +@forward "./button.scss"; +@forward "./action-button.scss"; diff --git a/packages/survey-creator-core/src/ctr-font-sizes.scss b/packages/survey-creator-core/src/ctr-font-sizes.scss index 222194d9c3..7b3599d933 100644 --- a/packages/survey-creator-core/src/ctr-font-sizes.scss +++ b/packages/survey-creator-core/src/ctr-font-sizes.scss @@ -1,3 +1,5 @@ +@use "./ctr-variables.scss" as *; + .svc-creator { --sjs-font-size-x05: calc(#{$font-unit} * 0.5); --sjs-font-size-x075: calc(#{$font-unit} * 0.75); diff --git a/packages/survey-creator-core/src/ctr-sizes.scss b/packages/survey-creator-core/src/ctr-sizes.scss index 0f9bd28a89..f898667a98 100644 --- a/packages/survey-creator-core/src/ctr-sizes.scss +++ b/packages/survey-creator-core/src/ctr-sizes.scss @@ -1,3 +1,5 @@ +@use "./ctr-variables.scss" as *; + .svc-creator { --sjs-spacing-x2: calc(#{$spacing-unit} * 2); --sjs-spacing-x3: calc(#{$spacing-unit} * 3); diff --git a/packages/survey-creator-core/src/ctr-variables.scss b/packages/survey-creator-core/src/ctr-variables.scss index 1d553a2c5d..64d2a464c6 100644 --- a/packages/survey-creator-core/src/ctr-variables.scss +++ b/packages/survey-creator-core/src/ctr-variables.scss @@ -4,10 +4,11 @@ $corner-radius-unit: var(--ctr-corner-radius-unit, 8px); $stroke-unit: var(--ctr-stroke-unit, 1px); $font-unit: var(--ctr-font-unit, 8px); $line-height-unit: var(--ctr-line-height-unit, 8px); -$font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))); +$-font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))); +$-base-unit: var(--sjs-base-unit, var(--base-unit, 8px)); @mixin ctrLargeFont { - font-family: $font-family; + font-family: $-font-family; font-size: var(--ctr-font-large-size, 32px); font-style: normal; font-weight: 400; @@ -20,10 +21,10 @@ $font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))) } @mixin ctrMediumFont { - --thm-medium-bold-font-size: calc(3 * #{$base-unit}); - --thm-medium-bold-line-height: calc(4 * #{$base-unit}); + --thm-medium-bold-font-size: calc(3 * #{$-base-unit}); + --thm-medium-bold-line-height: calc(4 * #{$-base-unit}); - font-family: $font-family; + font-family: $-font-family; font-size: var(--ctr-font-medium-size, var(--thm-medium-bold-font-size, 24px)); font-style: normal; font-weight: 400; @@ -36,10 +37,10 @@ $font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))) } @mixin ctrDefaultFont { - --thm-default-font-size: var(--sjs-font-size, calc(2 * #{$base-unit})); + --thm-default-font-size: var(--sjs-font-size, calc(2 * #{$-base-unit})); --thm-default-line-height: calc(1.5 * var(--thm-default-font-size)); - font-family: $font-family; + font-family: $-font-family; font-size: var(--ctr-font-default-size, var(--thm-default-font-size, 16px)); font-style: normal; font-weight: 400; @@ -70,11 +71,11 @@ $font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))) } @mixin ctrSmallFont { - --small-bold-font-size: var(--sjs-font-size, calc(2 * #{$base-unit})); + --small-bold-font-size: var(--sjs-font-size, calc(2 * #{$-base-unit})); --ctr-small-bold-font-size: calc(0.75 * var(--small-bold-font-size)); --ctr-small-bold-line-height: var(--small-bold-font-size); - font-family: $font-family; + font-family: $-font-family; font-size: var(--ctr-font-small-size, var(--ctr-small-bold-font-size, 12px)); font-style: normal; font-weight: 400; diff --git a/packages/survey-creator-core/src/custom-questions/boolean-switch.scss b/packages/survey-creator-core/src/custom-questions/boolean-switch.scss index d753687b22..e1394bc7d0 100644 --- a/packages/survey-creator-core/src/custom-questions/boolean-switch.scss +++ b/packages/survey-creator-core/src/custom-questions/boolean-switch.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .spg-boolean-switch, .spg-boolean-switch * { diff --git a/packages/survey-creator-core/src/lbr-font-sizes.scss b/packages/survey-creator-core/src/lbr-font-sizes.scss index 25768da2d9..371ab4ff0e 100644 --- a/packages/survey-creator-core/src/lbr-font-sizes.scss +++ b/packages/survey-creator-core/src/lbr-font-sizes.scss @@ -1,3 +1,5 @@ +@use "./lbr-variables.scss" as *; + .svc-creator { --lbr-line-height-x8: calc(#{$lbr-line-height-unit} * 8); --lbr-line-height-x7: calc(#{$lbr-line-height-unit} * 7); diff --git a/packages/survey-creator-core/src/lbr-sizes.scss b/packages/survey-creator-core/src/lbr-sizes.scss index 5e70356800..af024ce92a 100644 --- a/packages/survey-creator-core/src/lbr-sizes.scss +++ b/packages/survey-creator-core/src/lbr-sizes.scss @@ -1,3 +1,5 @@ +@use "./lbr-variables.scss" as *; + .svc-creator { --lbr-spacing-x16: calc(#{$lbr-spacing-unit} * 16); --lbr-spacing-x15: calc(#{$lbr-spacing-unit} * 15); diff --git a/packages/survey-creator-core/src/lbr-variables.scss b/packages/survey-creator-core/src/lbr-variables.scss index 0c6a3520b3..817f958a99 100644 --- a/packages/survey-creator-core/src/lbr-variables.scss +++ b/packages/survey-creator-core/src/lbr-variables.scss @@ -4,12 +4,14 @@ $lbr-corner-radius-unit: var(--lbr-corner-radius-unit, 8px); $lbr-stroke-unit: var(--lbr-stroke-unit, 1px); $lbr-font-unit: var(--lbr-font-unit, 8px); $lbr-line-height-unit: var(--lbr-line-height-unit, 8px); +$-font-family: var(--ctr-font-family, var(--sjs-font-family, var(--font-family))); +$-base-unit: var(--sjs-base-unit, var(--base-unit, 8px)); @mixin lbrDefaultFont { - --thm-default-font-size: var(--sjs-font-size, calc(2 * #{$base-unit})); + --thm-default-font-size: var(--sjs-font-size, calc(2 * #{$-base-unit})); --thm-default-line-height: calc(1.5 * var(--thm-default-font-size)); - font-family: $font-family; + font-family: $-font-family; font-size: var(--lbr-font-default-size, var(--thm-default-font-size, 16px)); font-style: normal; line-height: var(--lbr-font-default-line-height, var(--thm-default-line-height, 24px)); @@ -21,10 +23,10 @@ $lbr-line-height-unit: var(--lbr-line-height-unit, 8px); } @mixin lbrSmallFont { - --thm-small-line-height: var(--sjs-font-size, calc(2 * #{$base-unit})); + --thm-small-line-height: var(--sjs-font-size, calc(2 * #{$-base-unit})); --thm-small-font-size: calc(0.75 * var(--thm-small-line-height)); - font-family: $font-family; + font-family: $-font-family; font-size: var(--lbr-font-small-size, var(--thm-small-font-size, 12px)); font-style: normal; line-height: var(--lbr-font-small-line-height, var(--thm-small-line-height, 16px)); diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-action-bar.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-action-bar.scss index 35d06c6cfd..8043b68686 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-action-bar.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-action-bar.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-action-bar { display: flex; box-sizing: content-box; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-buttongroup.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-buttongroup.scss index 4eb24fa31d..e79ec188bc 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-buttongroup.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-buttongroup.scss @@ -1,3 +1,5 @@ +@use "../../variables" as *; + .spg-button-group { position: relative; display: flex; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-checkbox.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-checkbox.scss index 3148694b11..f1a243c6d2 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-checkbox.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-checkbox.scss @@ -1,3 +1,5 @@ +@use "../../variables" as *; + .spg-checkbox { cursor: pointer; margin-top: var(--ctr-checkbox-list-gap-vertical, calcSize(2)); diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-color-editor.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-color-editor.scss index f0af88bfd3..eb867bdf45 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-color-editor.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-color-editor.scss @@ -1,3 +1,5 @@ +@use "../../variables" as *; + .spg-color-editor__color-input { position: absolute; height: 1px; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-comment.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-comment.scss index fb2987b660..9b9f6b33dc 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-comment.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-comment.scss @@ -1,3 +1,5 @@ +@use "../../variables" as *; + .spg-comment { height: auto; max-width: 100%; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss index 4a0099ccae..ebf87d5ffe 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-dropdown.scss @@ -1,3 +1,5 @@ +@use "../../variables" as *; + .spg-dropdown { display: flex; padding-right: calc( diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss index 84026b2d0b..9ddb8003bc 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-input.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-input { @include ctrDefaultFont; -webkit-appearance: none; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-link.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-link.scss index ea6457eb91..989f31ddc0 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-link.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-link.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-link { display: flex; } diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-matrixdynamic.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-matrixdynamic.scss index 7b0322907a..a2127ad30c 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-matrixdynamic.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-matrixdynamic.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-matrixdynamic__drag-element { padding: calcSize(2); diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-panel.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-panel.scss index 49f87c0633..279c9e6ff6 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-panel.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-panel.scss @@ -1,3 +1,6 @@ +@use "../../variables.scss" as *; +@use "./variables.scss" as *; + .spg-panel { } .spg-panel__title { diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question-group.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question-group.scss index 5f350ffd05..53fd2a8097 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question-group.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question-group.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-question-group { .spg-row { margin-top: 0; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question.scss index 0d16280499..5717f448bc 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-question.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-question { display: flex; flex-direction: column; diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-search-editor.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-search-editor.scss index 6f00940684..d4598b39a8 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-search-editor.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-search-editor.scss @@ -1,4 +1,5 @@ -@import "../variables.scss"; +@use "../../variables.scss" as *; + .svc-side-bar { .svc-search { border-bottom: 1px solid var(--ctr-property-grid-search-border-color, $border); diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-table.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-table.scss index f41f715ac2..58dd9e7ff7 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-table.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-table.scss @@ -1,3 +1,6 @@ +@use "../../variables.scss" as *; +@use "./variables.scss" as *; + .spg-table-wrapper { border: var(--ctr-data-table-border-width, 1px) solid var(--ctr-data-table-border-color, $border); border-radius: var(--ctr-data-table-corner-radius, 0px); diff --git a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss index 344da57bbf..ce7f49e5ab 100644 --- a/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss +++ b/packages/survey-creator-core/src/property-grid-theme/blocks/spg-theme-builder.scss @@ -1,3 +1,5 @@ +@use "../../variables.scss" as *; + .spg-theme-builder-root { .sv-skeleton-element { min-height: 50px; diff --git a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss index 186be17711..0d1d9f94de 100644 --- a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss +++ b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss @@ -1,22 +1,21 @@ -@import "../variables.scss"; -@import "./blocks/variables.scss"; -@import "blocks/spg-action-bar.scss"; -@import "blocks/spg-question.scss"; -@import "blocks/spg-input.scss"; -@import "blocks/spg-dropdown.scss"; -@import "blocks/spg-comment.scss"; -@import "blocks/spg-panel.scss"; -@import "blocks/spg-checkbox.scss"; -@import "blocks/spg-matrixdynamic.scss"; -@import "blocks/spg-table.scss"; -@import "blocks/spg-question-group.scss"; -@import "blocks/spg-color-editor.scss"; -@import "blocks/spg-file-edit.scss"; -@import "blocks/spg-link"; -@import "blocks/spg-theme-builder.scss"; -@import "blocks/spg-overriding.scss"; -@import "blocks/spg-search-editor.scss"; -@import "blocks/spg-buttongroup.scss"; +@use "../variables" as *; +@forward "blocks/spg-action-bar.scss"; +@forward "blocks/spg-question.scss"; +@forward "blocks/spg-input.scss"; +@forward "blocks/spg-dropdown.scss"; +@forward "blocks/spg-comment.scss"; +@forward "blocks/spg-panel.scss"; +@forward "blocks/spg-checkbox.scss"; +@forward "blocks/spg-matrixdynamic.scss"; +@forward "blocks/spg-table.scss"; +@forward "blocks/spg-question-group.scss"; +@forward "blocks/spg-color-editor.scss"; +@forward "blocks/spg-file-edit.scss"; +@forward "blocks/spg-link"; +@forward "blocks/spg-theme-builder.scss"; +@forward "blocks/spg-overriding.scss"; +@forward "blocks/spg-search-editor.scss"; +@forward "blocks/spg-buttongroup.scss"; .spg-root-modern { position: relative; diff --git a/packages/survey-creator-core/src/responsivity.scss b/packages/survey-creator-core/src/responsivity.scss index 4a49384f7f..213efef1dc 100644 --- a/packages/survey-creator-core/src/responsivity.scss +++ b/packages/survey-creator-core/src/responsivity.scss @@ -1,4 +1,4 @@ -@import "./variables.scss"; +@use "./variables" as *; .svc-creator--mobile { .svc-tab-designer { diff --git a/packages/survey-creator-core/src/utils/context-button.scss b/packages/survey-creator-core/src/utils/context-button.scss index 963b5180cf..b187df773d 100644 --- a/packages/survey-creator-core/src/utils/context-button.scss +++ b/packages/survey-creator-core/src/utils/context-button.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-context-container { display: flex; diff --git a/packages/survey-creator-core/src/utils/layout.scss b/packages/survey-creator-core/src/utils/layout.scss index 34c8f979ee..6f2e6fb48f 100644 --- a/packages/survey-creator-core/src/utils/layout.scss +++ b/packages/survey-creator-core/src/utils/layout.scss @@ -1,4 +1,4 @@ -@import "../variables.scss"; +@use "../variables" as *; .svc-flex-container { display: flex; diff --git a/packages/survey-creator-core/src/variables-layer.scss b/packages/survey-creator-core/src/variables-layer.scss index e175a5c1d8..bb1bebaa8b 100644 --- a/packages/survey-creator-core/src/variables-layer.scss +++ b/packages/survey-creator-core/src/variables-layer.scss @@ -1,4 +1,4 @@ -@import "./variables.scss"; +@use "./variables" as *; $primary-background-500: var(--sjs-primary-background-500, #{$primary}); $primary-background-400: var(--sjs-primary-background-400, #{$primary-background-dark}); diff --git a/packages/survey-creator-core/src/variables.scss b/packages/survey-creator-core/src/variables.scss index 32c9596543..477248eb5e 100644 --- a/packages/survey-creator-core/src/variables.scss +++ b/packages/survey-creator-core/src/variables.scss @@ -1,5 +1,5 @@ -@import "./lbr-variables.scss"; -@import "./ctr-variables.scss"; +@forward "./lbr-variables.scss"; +@forward "./ctr-variables.scss"; $primary: var(--sjs-primary-backcolor, var(--primary, #19b394)); $primary-light: var(--sjs-primary-backcolor-light, var(--primary-light, rgba(25, 179, 148, 0.1))); From aa1b572bd9161a9b2e1f65bb558d94d541e10659 Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Mon, 23 Dec 2024 16:21:18 +0300 Subject: [PATCH 2/2] Deprecation Warning: Sass @import rules --- .../src/components/creator.scss | 16 ++++----- .../src/creator-theme/creator.scss | 4 +-- .../property-grid-theme/property-grid.scss | 34 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/survey-creator-core/src/components/creator.scss b/packages/survey-creator-core/src/components/creator.scss index 6a1bfa65c6..6237eec844 100644 --- a/packages/survey-creator-core/src/components/creator.scss +++ b/packages/survey-creator-core/src/components/creator.scss @@ -1,12 +1,12 @@ @use "../variables" as *; -@forward "./notifier.scss"; -@forward "./popup.scss"; -@forward "./button.scss"; -@forward "./surface-placeholder.scss"; -@forward "../lbr-font-sizes.scss"; -@forward "../lbr-sizes.scss"; -@forward "../ctr-font-sizes.scss"; -@forward "../ctr-sizes.scss"; +@use "./notifier.scss"; +@use "./popup.scss"; +@use "./button.scss"; +@use "./surface-placeholder.scss"; +@use "../lbr-font-sizes.scss"; +@use "../lbr-sizes.scss"; +@use "../ctr-font-sizes.scss"; +@use "../ctr-sizes.scss"; survey-creator, .svc-creator { diff --git a/packages/survey-creator-core/src/creator-theme/creator.scss b/packages/survey-creator-core/src/creator-theme/creator.scss index 749e2fdfef..3af646078a 100644 --- a/packages/survey-creator-core/src/creator-theme/creator.scss +++ b/packages/survey-creator-core/src/creator-theme/creator.scss @@ -1,2 +1,2 @@ -@forward "./button.scss"; -@forward "./action-button.scss"; +@use "./button.scss"; +@use "./action-button.scss"; diff --git a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss index 0d1d9f94de..6d353f135c 100644 --- a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss +++ b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss @@ -1,21 +1,21 @@ @use "../variables" as *; -@forward "blocks/spg-action-bar.scss"; -@forward "blocks/spg-question.scss"; -@forward "blocks/spg-input.scss"; -@forward "blocks/spg-dropdown.scss"; -@forward "blocks/spg-comment.scss"; -@forward "blocks/spg-panel.scss"; -@forward "blocks/spg-checkbox.scss"; -@forward "blocks/spg-matrixdynamic.scss"; -@forward "blocks/spg-table.scss"; -@forward "blocks/spg-question-group.scss"; -@forward "blocks/spg-color-editor.scss"; -@forward "blocks/spg-file-edit.scss"; -@forward "blocks/spg-link"; -@forward "blocks/spg-theme-builder.scss"; -@forward "blocks/spg-overriding.scss"; -@forward "blocks/spg-search-editor.scss"; -@forward "blocks/spg-buttongroup.scss"; +@use "blocks/spg-action-bar.scss"; +@use "blocks/spg-question.scss"; +@use "blocks/spg-input.scss"; +@use "blocks/spg-dropdown.scss"; +@use "blocks/spg-comment.scss"; +@use "blocks/spg-panel.scss"; +@use "blocks/spg-checkbox.scss"; +@use "blocks/spg-matrixdynamic.scss"; +@use "blocks/spg-table.scss"; +@use "blocks/spg-question-group.scss"; +@use "blocks/spg-color-editor.scss"; +@use "blocks/spg-file-edit.scss"; +@use "blocks/spg-link"; +@use "blocks/spg-theme-builder.scss"; +@use "blocks/spg-overriding.scss"; +@use "blocks/spg-search-editor.scss"; +@use "blocks/spg-buttongroup.scss"; .spg-root-modern { position: relative;