fix font-sizes from themes (#6650)

Co-authored-by: OlgaLarina <olga.larina.dev@gmail.com>
surveyjs · Aug 4, 2023 · de1f54b · de1f54b
1 parent bd2139b
commit de1f54b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git a/src/common-styles/sv-ranking.scss b/src/common-styles/sv-ranking.scss
@@ -95,8 +95,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   color: $foreground;
-  font-size: calcFontSize(1);
-  line-height: calcLineHeight(1.5);
+  font-size: $font-editorfont-size;
+  line-height: multiply(1.5, $font-editorfont-size);
   margin: 0 calcSize(2);
 }
 

diff --git a/src/defaultV2-theme/blocks/sd-action.scss b/src/defaultV2-theme/blocks/sd-action.scss
@@ -8,8 +8,8 @@
   font-weight: 600;
   font-family: var(--font-family, $font-family);
   font-style: normal;
-  font-size: calcFontSize(1);
-  line-height: calcLineHeight(1.5);
+  font-size: $font-questiontitle-size;
+  line-height: multiply(1.5, $font-questiontitle-size);
   outline: none;
 }
 

diff --git a/src/defaultV2-theme/blocks/sd-file.scss b/src/defaultV2-theme/blocks/sd-file.scss
@@ -62,6 +62,8 @@
   word-break: break-word;
   white-space: normal;
   color: $foreground-light;
+  font-size: $font-editorfont-size;
+  line-height: multiply(1.5, $font-editorfont-size);
 }
 
 .sd-file__choose-btn--text {

diff --git a/src/defaultV2-theme/blocks/sd-imagepicker.scss b/src/defaultV2-theme/blocks/sd-imagepicker.scss
@@ -88,8 +88,8 @@
 }
 
 .sd-imagepicker__text {
-  font-size: calcFontSize(1);
-  line-height: calcLineHeight(1.5);
+  font-size: $font-editorfont-size;
+  line-height: multiply(1.5, $font-editorfont-size);
   margin-top: calcSize(1);
   color: $foreground;
 }

diff --git a/src/defaultV2-theme/blocks/sd-navigation.scss b/src/defaultV2-theme/blocks/sd-navigation.scss
@@ -1,6 +1,8 @@
 .sd-body__navigation {
   .sd-btn {
     padding: calcSize(2) calcSize(8);
+    font-size: $font-questiontitle-size;
+    line-height: multiply(1.5, $font-questiontitle-size);
   }
 }
 

diff --git a/src/defaultV2-theme/blocks/sd-paneldynamic.scss b/src/defaultV2-theme/blocks/sd-paneldynamic.scss
@@ -96,7 +96,8 @@
 }
 
 .sd-paneldynamic__progress-text {
-    font-size: calcFontSize(1);
+    font-size: $font-questiontitle-size;
+    line-height: multiply(1.5, $font-questiontitle-size);
     color: $foreground-light;
     margin: 0;
     margin-right: calcSize(3);
@@ -190,7 +191,8 @@
     cursor: pointer;
 
     font-family: var(--font-family, $font-family);
-    font-size: calcFontSize(1);
+    font-size: $font-editorfont-size;
+    line-height: multiply(1.5, $font-editorfont-size);
     color: $foreground-light;
     overflow-x: hidden;
     white-space: nowrap;

diff --git a/src/defaultV2-theme/blocks/sd-question.scss b/src/defaultV2-theme/blocks/sd-question.scss
@@ -161,8 +161,8 @@
   gap: calcSize(0.5);
   justify-content: center;
   min-height: calcSize(24);
-  line-height: calcLineHeight(1.5);
-  font-size: calcFontSize(1);
+  font-size: $font-editorfont-size;
+  line-height: multiply(1.5, $font-editorfont-size);
   color: $foreground-light;
 
   &>div,

diff --git a/src/defaultV2-theme/blocks/sd-signaturepad.scss b/src/defaultV2-theme/blocks/sd-signaturepad.scss
@@ -1,7 +1,7 @@
-
-
 .sjs_sp_placeholder {
     color: $foreground-light;
+    font-size: $font-editorfont-size;
+    line-height: multiply(1.5, $font-editorfont-size);
 }
 
 .sjs_sp_container {

diff --git a/src/defaultV2-theme/blocks/sd-table.scss b/src/defaultV2-theme/blocks/sd-table.scss
@@ -52,8 +52,8 @@
 
 .sd-table__cell {
   font-weight: normal;
-  font-size: calcFontSize(1);
-  line-height: calcLineHeight(1.5);
+  font-size: $font-editorfont-size;
+  line-height: multiply(1.5, $font-editorfont-size);
   padding: calcSize(1);
   color: $foreground;
   text-align: center;