work for #6427 Remove sass variables usage

surveyjs · Jan 29, 2025 · 9796fd9 · 9796fd9
1 parent eb5ec9f
commit 9796fd9
Show file tree

Hide file tree

Showing 61 changed files with 13 additions and 5 deletions.
diff --git a/packages/survey-creator-core/src/components/matrix-cell.scss b/packages/survey-creator-core/src/components/matrix-cell.scss
@@ -41,7 +41,7 @@
   &.svc-visible {
     display: block;
     border: var(--ctr-survey-matrix-cell-border-width, var(--lbr-stroke-x2)) solid
-      var(--ctr-survey-matrix-cell-border-color-edit, var(--sjs-primary-background-500, #19b394ff));
+      var(--ctr-survey-matrix-cell-border-color-selected, var(--sjs-secondary-background-500, #19b394ff));
   }
 }
 
@@ -62,7 +62,7 @@
 
 .svc-matrix-cell__question-controls-button {
   border: var(--ctr-survey-contextual-button-border-width, var(--lbr-stroke-x1)) solid
-    var(--ctr-survey-contextual-button-border-color, var(--sjs-border-25));
+    var(--ctr-survey-contextual-button-border-color, var(--sjs-border-25, #d4d4d4ff));
 }
 
 .svc-matrix-cell:hover .svc-matrix-cell__question-controls {

diff --git a/packages/survey-creator-core/src/components/string-editor.scss b/packages/survey-creator-core/src/components/string-editor.scss
@@ -193,8 +193,9 @@
 .sd-table__cell--column-title {
   .svc-matrix-cell:not(:focus):focus-within {
     .svc-matrix-cell--selected {
-      border: calcSize(0.25) solid $primary;
-      border-radius: calcSize(0.5);
+      border-radius: var(--ctr-survey-matrix-cell-corner-radius, var(--lbr-corner-radius-x075));
+      border: var(--ctr-survey-matrix-cell-border-width, var(--lbr-stroke-x2)) solid
+        var(--ctr-survey-matrix-cell-border-color-edit, var(--sjs-primary-background-500, #19b394ff));
       display: block;
     }
   }

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
@@ -63,7 +63,14 @@ svc-tab-json-editor-textarea {
 */
 
 .svc-json-errors {
+  --thm-json-error-row: calc(
+    var(--ctr-code-viewer-code-error-row-border-width-top, var(--sjs-stroke-x1)) +
+      var(--ctr-code-viewer-code-error-row-padding-top, var(--sjs-spacing-x1)) +
+      var(--ctr-code-viewer-code-error-row-padding-bottom, var(--sjs-spacing-x1)) +
+      var(--ctr-code-viewer-code-error-row-fix-button-icon-height, var(--sjs-font-size-x3))
+  );
   display: flex;
+  max-height: calc(5 * var(--thm-json-error-row));
   overflow-y: auto;
   flex-direction: column;
   padding: 0;

diff --git a/visualRegressionTests-V2/tests/designer/etalons/boxshadow-one-panel.png b/visualRegressionTests-V2/tests/designer/etalons/boxshadow-one-panel.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/boxshadow-two-panels.png b/visualRegressionTests-V2/tests/designer/etalons/boxshadow-two-panels.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/convert-to-popup-panel.png b/visualRegressionTests-V2/tests/designer/etalons/convert-to-popup-panel.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/creator-theme-settings.png b/visualRegressionTests-V2/tests/designer/etalons/creator-theme-settings.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png b/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/design-surface-zoom-in.png b/visualRegressionTests-V2/tests/designer/etalons/design-surface-zoom-in.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png b/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png
diff --git a/...ests-V2/tests/designer/etalons/drag-drop-survey-element-empty-panel-dynamic.png b/...ests-V2/tests/designer/etalons/drag-drop-survey-element-empty-panel-dynamic.png
diff --git a/...ressionTests-V2/tests/designer/etalons/drag-drop-survey-element-empty-panel.png b/...ressionTests-V2/tests/designer/etalons/drag-drop-survey-element-empty-panel.png
diff --git a/...sionTests-V2/tests/designer/etalons/drag-drop-toolbox-custom-component-icon.png b/...sionTests-V2/tests/designer/etalons/drag-drop-toolbox-custom-component-icon.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/panel-title-editing.png b/visualRegressionTests-V2/tests/designer/etalons/panel-title-editing.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-date.png b/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-date.png
diff --git a/...RegressionTests-V2/tests/designer/etalons/properties-on-one-line-focus-date.png b/...RegressionTests-V2/tests/designer/etalons/properties-on-one-line-focus-date.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-focus.png b/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-focus.png
diff --git a/...egressionTests-V2/tests/designer/etalons/properties-on-one-line-narrow-date.png b/...egressionTests-V2/tests/designer/etalons/properties-on-one-line-narrow-date.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-narrow.png b/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line-narrow.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line.png b/visualRegressionTests-V2/tests/designer/etalons/properties-on-one-line.png
diff --git a/...igner/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced-hover.png b/...igner/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced-hover.png
diff --git a/...ts/designer/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced.png b/...ts/designer/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/surface-empty-panel.png b/visualRegressionTests-V2/tests/designer/etalons/surface-empty-panel.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/surface-matrix-detail-empty.png b/visualRegressionTests-V2/tests/designer/etalons/surface-matrix-detail-empty.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/test-tab-iphone-whole-tab.png b/visualRegressionTests-V2/tests/designer/etalons/test-tab-iphone-whole-tab.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/test-tab-iphone.png b/visualRegressionTests-V2/tests/designer/etalons/test-tab-iphone.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/test-tab-toolbar_responsive.png b/visualRegressionTests-V2/tests/designer/etalons/test-tab-toolbar_responsive.png
diff --git a/...onTests-V2/tests/designer/etalons/theme-editor-property-grid-advanced-group.png b/...onTests-V2/tests/designer/etalons/theme-editor-property-grid-advanced-group.png
diff --git a/...-V2/tests/designer/etalons/theme-editor-property-grid-header-group-advanced.png b/...-V2/tests/designer/etalons/theme-editor-property-grid-header-group-advanced.png
diff --git a/...sionTests-V2/tests/designer/etalons/theme-editor-property-grid-header-group.png b/...sionTests-V2/tests/designer/etalons/theme-editor-property-grid-header-group.png
diff --git a/visualRegressionTests-V2/tests/designer/etalons/theme-tab-toolbar_responsive.png b/visualRegressionTests-V2/tests/designer/etalons/theme-tab-toolbar_responsive.png
diff --git a/visualRegressionTests/tests/designer/etalons/boxshadow-one-panel.png b/visualRegressionTests/tests/designer/etalons/boxshadow-one-panel.png
diff --git a/visualRegressionTests/tests/designer/etalons/boxshadow-two-panels.png b/visualRegressionTests/tests/designer/etalons/boxshadow-two-panels.png
diff --git a/visualRegressionTests/tests/designer/etalons/convert-to-popup-panel.png b/visualRegressionTests/tests/designer/etalons/convert-to-popup-panel.png
diff --git a/visualRegressionTests/tests/designer/etalons/creator-theme-settings.png b/visualRegressionTests/tests/designer/etalons/creator-theme-settings.png
diff --git a/visualRegressionTests/tests/designer/etalons/design-surface-toolbar.png b/visualRegressionTests/tests/designer/etalons/design-surface-toolbar.png
diff --git a/visualRegressionTests/tests/designer/etalons/design-surface-zoom-in.png b/visualRegressionTests/tests/designer/etalons/design-surface-zoom-in.png
diff --git a/...onTests/tests/designer/etalons/drag-drop-survey-element-empty-panel-dynamic.png b/...onTests/tests/designer/etalons/drag-drop-survey-element-empty-panel-dynamic.png
diff --git a/...RegressionTests/tests/designer/etalons/drag-drop-survey-element-empty-panel.png b/...RegressionTests/tests/designer/etalons/drag-drop-survey-element-empty-panel.png
diff --git a/...ressionTests/tests/designer/etalons/drag-drop-toolbox-custom-component-icon.png b/...ressionTests/tests/designer/etalons/drag-drop-toolbox-custom-component-icon.png
diff --git a/visualRegressionTests/tests/designer/etalons/matrix-column-cell-hover.png b/visualRegressionTests/tests/designer/etalons/matrix-column-cell-hover.png
diff --git a/visualRegressionTests/tests/designer/etalons/matrix-column-cell-selected.png b/visualRegressionTests/tests/designer/etalons/matrix-column-cell-selected.png
diff --git a/visualRegressionTests/tests/designer/etalons/matrix-vertical-column-cell-hover.png b/visualRegressionTests/tests/designer/etalons/matrix-vertical-column-cell-hover.png
diff --git a/...RegressionTests/tests/designer/etalons/matrix-vertical-column-cell-selected.png b/...RegressionTests/tests/designer/etalons/matrix-vertical-column-cell-selected.png
diff --git a/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png b/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png
diff --git a/visualRegressionTests/tests/designer/etalons/panel-title-editing.png b/visualRegressionTests/tests/designer/etalons/panel-title-editing.png
diff --git a/visualRegressionTests/tests/designer/etalons/properties-on-one-line-date.png b/visualRegressionTests/tests/designer/etalons/properties-on-one-line-date.png
diff --git a/visualRegressionTests/tests/designer/etalons/properties-on-one-line-focus-date.png b/visualRegressionTests/tests/designer/etalons/properties-on-one-line-focus-date.png
diff --git a/visualRegressionTests/tests/designer/etalons/properties-on-one-line-focus.png b/visualRegressionTests/tests/designer/etalons/properties-on-one-line-focus.png
diff --git a/...alRegressionTests/tests/designer/etalons/properties-on-one-line-narrow-date.png b/...alRegressionTests/tests/designer/etalons/properties-on-one-line-narrow-date.png
diff --git a/visualRegressionTests/tests/designer/etalons/properties-on-one-line-narrow.png b/visualRegressionTests/tests/designer/etalons/properties-on-one-line-narrow.png
diff --git a/visualRegressionTests/tests/designer/etalons/properties-on-one-line.png b/visualRegressionTests/tests/designer/etalons/properties-on-one-line.png
diff --git a/...igner/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced-hover.png b/...igner/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced-hover.png
diff --git a/...ts/designer/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced.png b/...ts/designer/etalons/side-bar-tabbed-property-grid-theme-appearance-advanced.png
diff --git a/visualRegressionTests/tests/designer/etalons/surface-empty-panel.png b/visualRegressionTests/tests/designer/etalons/surface-empty-panel.png
diff --git a/visualRegressionTests/tests/designer/etalons/surface-matrix-detail-empty.png b/visualRegressionTests/tests/designer/etalons/surface-matrix-detail-empty.png
diff --git a/...ssionTests/tests/designer/etalons/theme-editor-property-grid-advanced-group.png b/...ssionTests/tests/designer/etalons/theme-editor-property-grid-advanced-group.png
diff --git a/...sts/tests/designer/etalons/theme-editor-property-grid-header-group-advanced.png b/...sts/tests/designer/etalons/theme-editor-property-grid-header-group-advanced.png
diff --git a/...ressionTests/tests/designer/etalons/theme-editor-property-grid-header-group.png b/...ressionTests/tests/designer/etalons/theme-editor-property-grid-header-group.png
diff --git a/visualRegressionTests/tests/designer/surface.ts b/visualRegressionTests/tests/designer/surface.ts
@@ -660,7 +660,7 @@ test("Panel empty", async (t) => {
     };
     await setJSON(json);
     await takeElementScreenshot("surface-empty-panel.png", Selector(".svc-question__content"), t, comparer);
-    await t.hover(Selector(".svc-question__content div").withText("Add Question"));
+    await t.hover(Selector(".svc-panel__add-new-question"));
     await takeElementScreenshot("surface-empty-panel-hover.png", Selector(".svc-question__content"), t, comparer);
   });
 });