Skip to content

Commit 2eae458

Browse files
author
OlgaLarina
committed
remove $foreground variable
1 parent 626bdad commit 2eae458

File tree

12 files changed

+24
-49
lines changed

12 files changed

+24
-49
lines changed

packages/survey-creator-core/src/components/page-navigator/page-navigator-item.scss

-7
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,4 @@ svc-page-navigator-item,
144144

145145
.svc-page-navigator-item__dot {}
146146
}
147-
}
148-
149-
.svc-page-navigator-item--disabled {
150-
.svc-page-navigator-item__banner {
151-
color: $foreground;
152-
opacity: 0.25;
153-
}
154147
}

packages/survey-creator-core/src/components/page-navigator/page-navigator.scss

+7
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ svc-page-navigator,
6565
}
6666
}
6767

68+
.svc-page-navigator-item--disabled {
69+
.svc-page-navigator-item__banner {
70+
color: var(--ctr-page-navigator-button-icon-color-disabled, var(--sjs-layer-3-foreground-100, #000000e6));
71+
opacity: var(--ctr-page-navigator-button-icon-opacity-disabled, 0.25);
72+
}
73+
}
74+
6875
.svc-page-navigator__button--pressed,
6976
.svc-page-navigator__button:active {
7077
.svc-page-navigator__button-icon {

packages/survey-creator-core/src/components/question.scss

+12-28
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,10 @@ svc-question {
246246
overflow-x: initial;
247247
}
248248

249-
.sd-multipletext__item-title {
250-
color: $foreground;
251-
}
252-
253249
.sd-multipletext__item-container.sd-input:focus-within {
254250
// box-shadow: var(--sjs-shadow-inner, inset 0px 1px 2px 0px rgba(0, 0, 0, 0.149)); // #00000026
255251
}
256252

257-
.sd-matrixdynamic__btn.sd-matrixdynamic__add-btn {
258-
color: $foreground;
259-
opacity: 0.25;
260-
}
261-
262253
.sjs_sp_placeholder {
263254
user-select: all;
264255
pointer-events: all;
@@ -400,7 +391,7 @@ svc-question {
400391
margin-inline-start: 0;
401392

402393
use {
403-
fill: var(--ctr-survey-question-panel-toolbar-item-icon-color, var(--sjs-secondary-background-500, #19b394ff));
394+
fill: var(--ctr-list-item-icon-color, var(--sjs-primary-background-500, #19b394));
404395
}
405396
}
406397
}
@@ -446,7 +437,7 @@ svc-question {
446437

447438
.svc-list__item:hover > .svc-list__item-body .sv-svg-icon use,
448439
.sv-svg-icon use {
449-
fill: var(--sjs-secondary-background-500, #19B394FF);
440+
fill: var(--sjs-secondary-background-500, #19b394ff);
450441
}
451442
}
452443

@@ -462,14 +453,9 @@ svc-question {
462453
}
463454

464455
.svc-question__content--collapsed-drag-over-inside:not(.svc-question__content--dragged) {
465-
box-shadow: var(--ctr-survey-panel-border-width-overing, var(--lbr-stroke-x2)) solid
466-
var(--ctr-survey-panel-border-color-overing, var(--sjs-primary-background-500, #19b394ff));
467-
background: linear-gradient(
468-
0deg,
469-
var(--ctr-survey-panel-background-color-overing, var(--sjs-primary-background-10, #19b3941a)) 0%,
470-
var(--ctr-survey-panel-background-color-overing, var(--sjs-primary-background-10, #19b3941a)) 100%
471-
),
472-
var(--lbr-question-panel-background-color, var(--sjs-layer-1-background-500, #ffffffff));
456+
box-shadow: 0 0 0 var(--ctr-survey-placeholder-border-width-hovered, var(--lbr-stroke-x2))
457+
var(--ctr-survey-placeholder-border-color-hovered, var(--sjs-primary-background-500, #19b394ff));
458+
background: var(--ctr-survey-placeholder-background-color-hovered, var(--sjs-primary-background-10, #19b3941a));
473459

474460
animation: collapsed-drag-over-inside-blinking 1s;
475461
}
@@ -618,7 +604,10 @@ svc-question {
618604
}
619605

620606
.svc-dragged-element-shortcut--has-icon {
621-
padding: var(--ctr-toolbox-item-padding-top, var(--sjs-spacing-x1)) var(--ctr-toolbox-item-padding-right, var(--sjs-spacing-x2)) var(--ctr-toolbox-item-padding-bottom, var(--sjs-spacing-x1)) var(--ctr-toolbox-item-padding-left, var(--sjs-spacing-x150));
607+
padding: var(--ctr-toolbox-item-padding-top, var(--sjs-spacing-x1))
608+
var(--ctr-toolbox-item-padding-right, var(--sjs-spacing-x2))
609+
var(--ctr-toolbox-item-padding-bottom, var(--sjs-spacing-x1))
610+
var(--ctr-toolbox-item-padding-left, var(--sjs-spacing-x150));
622611
display: flex;
623612
gap: var(--ctr-toolbox-item-gap, var(--sjs-spacing-x1));
624613
justify-content: center;
@@ -641,14 +630,9 @@ svc-question {
641630
.svc-question__content--drag-over-inside,
642631
.svc-hovered > .svc-question__content--drag-over-inside {
643632
.svc-panel__placeholder_frame {
644-
box-shadow: 0 0 0 1px var(--ctr-survey-panel-border-color-overing, var(--sjs-primary-background-500, #19b394ff));
645-
border: 1px solid var(--ctr-survey-panel-border-color-overing, var(--sjs-primary-background-500, #19b394ff));
646-
background: linear-gradient(
647-
0deg,
648-
var(--ctr-survey-panel-background-color-overing, var(--sjs-primary-background-10, #19b3941a)) 0%,
649-
var(--ctr-survey-panel-background-color-overing, var(--sjs-primary-background-10, #19b3941a)) 100%
650-
),
651-
var(--lbr-question-panel-background-color, var(--sjs-layer-1-background-500, #ffffffff));
633+
box-shadow: 0 0 0 1px var(--ctr-survey-placeholder-border-color-hovered, var(--sjs-primary-background-500, #19b394ff));
634+
border: 1px solid var(--ctr-survey-placeholder-border-color-hovered, var(--sjs-primary-background-500, #19b394ff));
635+
background: var(--ctr-survey-placeholder-background-color-hovered, var(--sjs-primary-background-10, #19b3941a));
652636

653637
& > .svc-question__content-actions {
654638
opacity: 1;

packages/survey-creator-core/src/components/string-editor.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
}
6060

6161
.svc-remaining-character-counter {
62-
@include ctrSmallFont;
62+
@include lbrSmallFont;
6363
display: none;
6464
position: relative;
6565
outline: none;
6666
z-index: 20;
6767
padding: 0px;
6868
vertical-align: top;
6969
margin-inline-start: calcSize(2);
70-
color: var(--ctr-text-decor-text-color-limitation, var(--sjs-layer-1-foreground-50, #00000080));
70+
color: var(--ctr-text-decor-text-color-placeholder, var(--sjs-layer-1-foreground-50, #00000080));
7171
}
7272

7373
.svc-string-editor__border {

packages/survey-creator-core/src/components/tabs/test.scss

+1-8
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@
8383

8484
.svc-page-selector {
8585
max-width: 50%;
86-
87-
.sv-action-bar-item__title {
88-
@include textEllipsis;
89-
90-
color: $foreground;
91-
display: inline-block;
92-
}
9386
}
9487
}
9588

@@ -109,7 +102,7 @@
109102
}
110103
.svc-test-tab__content .sd-body--empty {
111104
@include ctrDefaultFont;
112-
color: $foreground;
105+
color: var(--sjs-layer-1-foreground-100, #000000E6);
113106
text-align: center;
114107
overflow: hidden;
115108
position: static;

packages/survey-creator-core/src/components/toolbox/toolbox.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236

237237
.svc-toolbox__category-title {
238238
@include ctrSmallBoldFont;
239-
color: $foreground;
239+
color: var(--ctr-toolbox-group-header-text-color, var(--sjs-layer-1-foreground-100, #000000e6));
240240
vertical-align: middle;
241241
display: block;
242242
flex-grow: 1;

packages/survey-creator-core/src/variables.scss

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@forward "./lbr-variables.scss";
22
@forward "./ctr-variables.scss";
33

4-
$foreground: var(--sjs-general-forecolor, var(--foreground, #161616));
5-
64
$base-unit: var(--sjs-base-unit, var(--base-unit, 8px));
75

86
$sd-panel-normal-min-width: 496px;
Loading
Loading
Loading

visualRegressionTests/tests/designer/pg-logic-actions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test("Check list item styles into logic popup", async (t) => {
7171

7272
await t.click(sectionContentElement.find(".spg-action-button").nth(2))
7373
.click(Selector(".sl-dropdown"))
74-
.click(getListItemByText("region"))
74+
.click(getListItemByText("region"), { offsetX: 10, offsetY: 20 })
7575
.wait(1000)
7676
.pressKey("tab")
7777
.pressKey("tab")

0 commit comments

Comments
 (0)