();
const progress = computed(() => props.survey.progressValue + "%");
diff --git a/src/defaultV2-theme/blocks/sd-body.scss b/src/defaultV2-theme/blocks/sd-body.scss
index cac51f858d..29a27b758a 100644
--- a/src/defaultV2-theme/blocks/sd-body.scss
+++ b/src/defaultV2-theme/blocks/sd-body.scss
@@ -93,16 +93,6 @@
gap: calcSize(2);
}
-.sd-body__progress {
- margin-bottom: calcSize(4);
-}
-
-.sd-body__progress--top {
- position: sticky;
- top: 0;
- z-index: 50;
-}
-
.sd-body--empty {
min-height: 400px;
text-align: center;
@@ -158,6 +148,7 @@
&:hover {
background-color: $background-dark;
}
+
&:focus {
box-shadow: 0 0 0 2px $primary;
}
diff --git a/src/defaultV2-theme/blocks/sd-progress.scss b/src/defaultV2-theme/blocks/sd-progress.scss
index 18627cec38..d9066f24fa 100644
--- a/src/defaultV2-theme/blocks/sd-progress.scss
+++ b/src/defaultV2-theme/blocks/sd-progress.scss
@@ -27,4 +27,15 @@
@media only screen and (max-width: calcSize(125)) {
margin-left: 10px;
}
+}
+
+.sd-body__progress--top {
+ margin-bottom: calcSize(4);
+ position: sticky;
+ top: 0;
+ z-index: 50;
+}
+
+.sd-body__progress--bottom .sd-progress__text {
+ margin-top: calcSize(-3.5);
}
\ No newline at end of file
diff --git a/src/knockout/components/components-container/components-container.html b/src/knockout/components/components-container/components-container.html
index f5e8f7e429..b1d5a86b45 100644
--- a/src/knockout/components/components-container/components-container.html
+++ b/src/knockout/components/components-container/components-container.html
@@ -3,7 +3,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/src/knockout/components/progress/progress.html b/src/knockout/components/progress/progress.html
index 44d35b786a..5b789f5401 100644
--- a/src/knockout/components/progress/progress.html
+++ b/src/knockout/components/progress/progress.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/knockout/components/progress/progress.ts b/src/knockout/components/progress/progress.ts
index b0c2537f9e..447096b442 100644
--- a/src/knockout/components/progress/progress.ts
+++ b/src/knockout/components/progress/progress.ts
@@ -3,7 +3,7 @@ import { SurveyProgressModel } from "survey-core";
const template = require("html-loader?interpolate!val-loader!./progress.html");
export class ProgressViewModel {
- constructor(public model: any) {}
+ constructor(public model: any, private container: string = "header") { }
getProgressTextInBarCss(css: any): string {
return SurveyProgressModel.getProgressTextInBarCss(css);
@@ -11,12 +11,15 @@ export class ProgressViewModel {
getProgressTextUnderBarCss(css: any): string {
return SurveyProgressModel.getProgressTextUnderBarCss(css);
}
+ getProgressCssClasses() {
+ return this.model.getProgressCssClasses(this.container);
+ }
}
ko.components.register("sv-progress-progress", {
viewModel: {
createViewModel: (params: any) => {
- return new ProgressViewModel(params.model);
+ return new ProgressViewModel(params.model, params.container);
}
},
template: template
@@ -26,7 +29,7 @@ const templateBridge = "