diff --git a/e2e/survey/cookie.spec.ts b/e2e/survey/cookie.spec.ts index a5d07e90cf..5cf1be6f13 100644 --- a/e2e/survey/cookie.spec.ts +++ b/e2e/survey/cookie.spec.ts @@ -49,11 +49,11 @@ frameworks.forEach((framework) => { await page.goto(`${url}${framework}`); await initSurvey(page, framework, json); - await expect(page.locator(".sd-body h3").getByText("You have already completed this survey.")).toBeVisible(); + await expect(page.locator(".sd-body").getByText("You have already completed this survey.")).toBeVisible(); await deleteCookie(page); await firstElement.hover(); - await expect(page.locator(".sd-body h3").getByText("You have already completed this survey.")).not.toBeVisible(); + await expect(page.locator(".sd-body").getByText("You have already completed this survey.")).not.toBeVisible(); }); }); }); \ No newline at end of file diff --git a/packages/survey-core/src/default-theme/blocks/sd-completedpage.scss b/packages/survey-core/src/default-theme/blocks/sd-completedpage.scss index e275fd106e..5c22d57909 100644 --- a/packages/survey-core/src/default-theme/blocks/sd-completedpage.scss +++ b/packages/survey-core/src/default-theme/blocks/sd-completedpage.scss @@ -2,6 +2,7 @@ @use "../mixins.scss" as mixins; .sd-completedpage, +.sd-body--loading, .sd-completed-before-page { align-items: center; font-family: $font-family; @@ -10,20 +11,20 @@ text-align: center; height: auto; @include mixins.articleHtml; + &:not(:has(> *)) { + @include mixins.articleLargeFont; + } } - -.sd-completedpage:before, -.sd-completedpage:after { - display: block; - width: calcSize(9); - margin-left: calc(50% - 4.5 * #{$base-unit}); - content: ""; +.sd-completedpage { + &:has(> *) { + padding: calcSize(13) 0 calcSize(2) 0; + } + padding: calcSize(17) 0 calcSize(6) 0; } - -.sd-completedpage:before { - height: calcSize(13); +.sd-body--loading, +.sd-completed-before-page { + &:has(> *) { + padding: 0; + } + padding: calcSize(4) 0 calcSize(4) 0; } - -.sd-completedpage:after { - height: calcSize(2); -} \ No newline at end of file diff --git a/packages/survey-core/src/default-theme/mixins.scss b/packages/survey-core/src/default-theme/mixins.scss index 35bad6a9ea..9d144af566 100644 --- a/packages/survey-core/src/default-theme/mixins.scss +++ b/packages/survey-core/src/default-theme/mixins.scss @@ -102,7 +102,6 @@ h2 { @include articleXLargeFont; } - h3 { @include articleLargeFont; } @@ -144,7 +143,9 @@ font-size: $font-questiontitle-size; line-height: multiply(1.5, $font-questiontitle-size); - box-shadow: $shadow-small, 0 0 0 0px $primary; + box-shadow: + $shadow-small, + 0 0 0 0px $primary; transition: box-shadow $transition-duration; &:hover { @@ -152,7 +153,9 @@ } &:focus { - box-shadow: $shadow-small-reset, 0 0 0 2px $primary; + box-shadow: + $shadow-small-reset, + 0 0 0 2px $primary; } span { diff --git a/packages/survey-core/src/localizablestring.ts b/packages/survey-core/src/localizablestring.ts index 97e02e8463..0d98d1fcb8 100644 --- a/packages/survey-core/src/localizablestring.ts +++ b/packages/survey-core/src/localizablestring.ts @@ -61,7 +61,6 @@ export class LocalizableString implements ILocalizableString { public onGetTextCallback: (str: string, nonProcessedText?: string) => string; public storeDefaultText: boolean; public serializeCallBackText: boolean; - public onGetLocalizationTextCallback: (str: string) => string; public onStrChanged: (oldValue: string, newValue: string) => void; public lastChangedLoc: string; public onSearchChanged: () => void; @@ -155,9 +154,6 @@ export class LocalizableString implements ILocalizableString { } if (this.isValueEmpty(res) && !!this.getLocalizationName()) { res = this.getLocalizationStr(); - if (!!this.onGetLocalizationTextCallback) { - res = this.onGetLocalizationTextCallback(res); - } } if (!res) res = this.defaultValue || ""; return res; diff --git a/packages/survey-core/src/survey.ts b/packages/survey-core/src/survey.ts index 5b0119fe62..9e182e214b 100644 --- a/packages/survey-core/src/survey.ts +++ b/packages/survey-core/src/survey.ts @@ -950,10 +950,9 @@ export class SurveyModel extends SurveyElementCore // if (DomDocumentHelper.isAvailable()) { // SurveyModel.stylesManager = new StylesManager(); // } - const htmlCallBack = (str: string): string => { return "