diff --git a/projects/common/assets/common-styles.css b/projects/common/assets/common-styles.css
index b31aa164587411faf0f69a8dac4f78f879bab975..37b3867a2323f4b45721ecca653b26518a820c46 100644
--- a/projects/common/assets/common-styles.css
+++ b/projects/common/assets/common-styles.css
@@ -1,6 +1,6 @@
body {
margin: 0;
- font-family: 'Roboto', sans-serif
+ font-family: 'NunitoSans', sans-serif;
}
/*This is part of a hack to set the bodys cursor to grabbing while
diff --git a/projects/common/assets/customTheme.scss b/projects/common/assets/customTheme.scss
index 8e33a3e86444e67d43384cd078e50627d2f225e7..00de2307a2b9614448690bb1003a414eb3a1411c 100644
--- a/projects/common/assets/customTheme.scss
+++ b/projects/common/assets/customTheme.scss
@@ -1,6 +1,11 @@
@use '../../../node_modules/@angular/material/index' as mat;
@import '../../../node_modules/@angular/material/theming';
+$aspect-typography: mat.define-typography-config(
+ $font-family: 'NunitoSans',
+);
+@include angular-material-typography($aspect-typography);
+
$aspect-element-border-color: #ccc;
$aspect-element-border-hover-color: #333;
$aspect-primary: mat.define-palette(mat.$pink-palette);
diff --git a/projects/common/assets/fonts/NunitoSans-Italic-VariableFont_YTLC,opsz,wdth,wght.ttf b/projects/common/assets/fonts/NunitoSans-Italic-VariableFont_YTLC,opsz,wdth,wght.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ffd9c95409b738bd727cbe9cf8f01b480970e1c9
Binary files /dev/null and b/projects/common/assets/fonts/NunitoSans-Italic-VariableFont_YTLC,opsz,wdth,wght.ttf differ
diff --git a/projects/common/assets/fonts/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf b/projects/common/assets/fonts/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8a034686c337d2bed59ab089f6a20add56bd5b4c
Binary files /dev/null and b/projects/common/assets/fonts/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2
deleted file mode 100644
index f1bfb055d7e07b2a12944824c14bc70fe0f17125..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBBc4.woff2
deleted file mode 100644
index ce795fa8bdd3ca2b9c42124cc89e61e9272e9fb2..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2
deleted file mode 100644
index ccd96335454ca6bd1ca8618cfd8c45ee548b3729..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2
deleted file mode 100644
index 3f093dd9c3462ee63cdd85cd74e47dcfc026f640..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2
deleted file mode 100644
index e6f9427038fe09dcb167bc737a7220b6ce6cb4f6..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2
deleted file mode 100644
index 7ef9a9261848262ec6133b15b5a872cec4e3e2b8..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2
deleted file mode 100644
index 01c0cc84d00b6677ff87fa0904adbfb0f5b2835b..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2
deleted file mode 100644
index 88ef7219e27e64450649ced0b6b515dbb4eebd78..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBBc4.woff2
deleted file mode 100644
index 46445bf807becda5c338b1bb09d2e93398fc4861..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2
deleted file mode 100644
index f1e82f128bf54c0e7c572b61aa4a03feae1aa7f2..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2
deleted file mode 100644
index a07a3e366b962a83909a3a95616ab65eebc280cb..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2
deleted file mode 100644
index 082312b802ab1cf9140e9d4232fa668bf2d0b078..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2
deleted file mode 100644
index f113c08c7d31b14336394dab2825308d0e45d35e..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2 b/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2
deleted file mode 100644
index 99c38c0b3d90d7aa478315ad17511f70f7346a55..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4WxKOzY.woff2
deleted file mode 100644
index fa0d664fece6dbcfc5a6c889feb1d1a9121d771e..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4WxKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4mxK.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4mxK.woff2
deleted file mode 100644
index ebe1795f85a661c205e4a4612eaf47d56273e68e..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu4mxK.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu5mxKOzY.woff2
deleted file mode 100644
index f1b8ed7caa291d212ba2e442667833f271951284..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu5mxKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu72xKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu72xKOzY.woff2
deleted file mode 100644
index c6d7d06199e326df7cd17c74eb8ab0f2b33e8c37..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu72xKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7GxKOzY.woff2
deleted file mode 100644
index e2f7d27512ee991ac1b10e9ede5357efa5208ec5..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7WxKOzY.woff2
deleted file mode 100644
index d5ca3ce243ceb794bc68eed6e4c568cc1c2055a3..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7WxKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 b/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7mxKOzY.woff2
deleted file mode 100644
index f8b68e3acc6321a0d5bc1e0ee123f229f279420c..0000000000000000000000000000000000000000
Binary files a/projects/common/assets/fonts/roboto/KFOmCnqEu92Fr1Mu7mxKOzY.woff2 and /dev/null differ
diff --git a/projects/common/assets/notoSansSymbols2.css b/projects/common/assets/notoSansSymbols2.css
index 260c3376f78f4122d0b2b69b311b82763ecd98c9..d6a03a8bc52c8a7c031072214c691d32927bf7c9 100644
--- a/projects/common/assets/notoSansSymbols2.css
+++ b/projects/common/assets/notoSansSymbols2.css
@@ -1,5 +1,5 @@
@font-face {
- font-family: 'Roboto'; /* Extend the Roboto font family */
+ font-family: 'NunitoSans'; /* Extend the Roboto font family */
src: url(fonts/noto-sans-symbols-2-v13-symbols-regular.woff2) format('woff2');
unicode-range: U+2B1C, U+2758, U+2219; /* Square, Dot, Point*/
}
diff --git a/projects/common/assets/nunitosans.css b/projects/common/assets/nunitosans.css
new file mode 100644
index 0000000000000000000000000000000000000000..fd13f60d17e8d73ac141264ab90dae73fa9fd776
--- /dev/null
+++ b/projects/common/assets/nunitosans.css
@@ -0,0 +1,4 @@
+@font-face {
+ font-family: 'NunitoSans';
+ src: url('fonts/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf');
+}
diff --git a/projects/common/assets/roboto.css b/projects/common/assets/roboto.css
deleted file mode 100644
index 04b6f314f615beb99590d14db6e618efb38b959c..0000000000000000000000000000000000000000
--- a/projects/common/assets/roboto.css
+++ /dev/null
@@ -1,189 +0,0 @@
-/* cyrillic-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2) format('woff2');
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-/* cyrillic */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2) format('woff2');
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2) format('woff2');
- unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2) format('woff2');
- unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2) format('woff2');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmSU5fBBc4.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* cyrillic-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu72xKOzY.woff2) format('woff2');
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-/* cyrillic */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu5mxKOzY.woff2) format('woff2');
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu7mxKOzY.woff2) format('woff2');
- unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu4WxKOzY.woff2) format('woff2');
- unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu7WxKOzY.woff2) format('woff2');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu7GxKOzY.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url(fonts/roboto/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-/* cyrillic-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fCRc4EsA.woff2) format('woff2');
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
-}
-/* cyrillic */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fABc4EsA.woff2) format('woff2');
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fCBc4EsA.woff2) format('woff2');
- unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fBxc4EsA.woff2) format('woff2');
- unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fCxc4EsA.woff2) format('woff2');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url(fonts/roboto/KFOlCnqEu92Fr1MmEU9fBBc4.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
diff --git a/projects/common/components/button/button.component.ts b/projects/common/components/button/button.component.ts
index db4098e1ea55ff11d218a404617bafbb954783e2..8c1a49bd5d48aa79abb97c3333986b676f03127e 100644
--- a/projects/common/components/button/button.component.ts
+++ b/projects/common/components/button/button.component.ts
@@ -11,7 +11,6 @@ import { ElementComponent } from '../../directives/element-component.directive';
href="{{elementModel.action+'-'+elementModel.actionParam}}"
[style.background-color]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -31,7 +30,6 @@ import { ElementComponent } from '../../directives/element-component.directive';
class="full-size"
[style.background-color]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size]="elementModel.labelAlignment !== 'baseline' ?
'smaller' :
elementModel.styling.fontSize + 'px'"
diff --git a/projects/common/components/compound-elements/cloze/cloze-child-elements/text-field-simple.component.ts b/projects/common/components/compound-elements/cloze/cloze-child-elements/text-field-simple.component.ts
index 1d31c21f81fad671b1d161d5b01e9239f4655d2b..415d3247e7da48e7fc7289daa119cd2828f47916 100644
--- a/projects/common/components/compound-elements/cloze/cloze-child-elements/text-field-simple.component.ts
+++ b/projects/common/components/compound-elements/cloze/cloze-child-elements/text-field-simple.component.ts
@@ -23,7 +23,6 @@ import { TextInputComponent } from 'common/directives/text-input-component.direc
[attr.inputmode]="elementModel.showSoftwareKeyboard ? 'none' : 'text'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/compound-elements/cloze/cloze-child-elements/toggle-button.component.ts b/projects/common/components/compound-elements/cloze/cloze-child-elements/toggle-button.component.ts
index 3171078876a02f0df7cb98f96b743287d31422f0..ed5ee5b9ec08226f49d38b4d9c08d320e7ddc4aa 100644
--- a/projects/common/components/compound-elements/cloze/cloze-child-elements/toggle-button.component.ts
+++ b/projects/common/components/compound-elements/cloze/cloze-child-elements/toggle-button.component.ts
@@ -39,7 +39,6 @@ import { ToggleButtonElement } from 'common/models/elements/compound-elements/cl
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
[style.text-decoration]="elementModel.styling.underline ? 'underline' : ''"
- [style.font-family]="elementModel.styling.font"
[style.background-color]="elementFormControl.value !== null &&
elementFormControl.value === i ?
elementModel.styling.selectionColor :
diff --git a/projects/common/components/compound-elements/cloze/cloze.component.ts b/projects/common/components/compound-elements/cloze/cloze.component.ts
index 1902c73ba439f826798c484f484e02142790ae23..4ef318264a52f5a51b44aaae528f2b68b77340fd 100644
--- a/projects/common/components/compound-elements/cloze/cloze.component.ts
+++ b/projects/common/components/compound-elements/cloze/cloze.component.ts
@@ -47,7 +47,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
<p *ngIf="part.type === 'paragraph'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -65,7 +64,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -77,7 +75,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -89,7 +86,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -101,7 +97,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -113,7 +108,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -125,7 +119,6 @@ import { ClozeChildOverlay } from './cloze-child-overlay.component';
[style.display]="'inline'"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/compound-elements/likert/likert.component.ts b/projects/common/components/compound-elements/likert/likert.component.ts
index fc6f64716e646db896c43dd8d8b8b4ffb7d3eba0..ad0690a647f80efdd8f6ec542ca2ed79104e827b 100644
--- a/projects/common/components/compound-elements/likert/likert.component.ts
+++ b/projects/common/components/compound-elements/likert/likert.component.ts
@@ -15,7 +15,6 @@ import { LikertRadioButtonGroupComponent } from './likert-radio-button-group.com
<div class="wrapper"
[style.background-color]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
diff --git a/projects/common/components/input-elements/checkbox.component.ts b/projects/common/components/input-elements/checkbox.component.ts
index 7d16da4f31876edb757d9cb97b9359083c8f768d..72f894fcfb10bd940f3ddf0be7f48a255cb6412d 100644
--- a/projects/common/components/input-elements/checkbox.component.ts
+++ b/projects/common/components/input-elements/checkbox.component.ts
@@ -14,7 +14,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[checked]="$any(elementModel.value)"
[class.cross-out]="elementModel.crossOutChecked && elementFormControl.value"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/drop-list.component.ts b/projects/common/components/input-elements/drop-list.component.ts
index 0b1b694d0e60e069dba6b855ccfc769c793a7a56..21202be564587139af757feae349f6217259050a 100644
--- a/projects/common/components/input-elements/drop-list.component.ts
+++ b/projects/common/components/input-elements/drop-list.component.ts
@@ -39,7 +39,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
(cdkDropListDropped)="drop($event);"
[style.gap.px]="elementModel.onlyOneItem ? 0 : 5"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -75,7 +74,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[class.audio-list-item]="dropListValueElement.audioSrc"
[class.cloze-context-preview]="clozeContext"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/dropdown.component.ts b/projects/common/components/input-elements/dropdown.component.ts
index 865074db80cfee14d6c20486d17888ae6722bf11..64764005f3da4b9c7df29e21f5f5af0c363fc2fc 100644
--- a/projects/common/components/input-elements/dropdown.component.ts
+++ b/projects/common/components/input-elements/dropdown.component.ts
@@ -11,7 +11,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[style.height.%]="100"
aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor">
<mat-label [style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/math-field.component.ts b/projects/common/components/input-elements/math-field.component.ts
index e764e8951e715f3e8f29e6bf3d5f57cdfc9a5f07..fa2cee5008b0cfdfc80cc827b1bc036bd64db99c 100644
--- a/projects/common/components/input-elements/math-field.component.ts
+++ b/projects/common/components/input-elements/math-field.component.ts
@@ -11,7 +11,6 @@ import { MathFieldElement } from 'common/models/elements/input-elements/math-fie
template: `
<div [style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/radio-button-group.component.ts b/projects/common/components/input-elements/radio-button-group.component.ts
index 93d5f0ff86bd769947408fdb0b28a8619838e5c3..5841e20018603389d1207837fbc03e33d2600728 100644
--- a/projects/common/components/input-elements/radio-button-group.component.ts
+++ b/projects/common/components/input-elements/radio-button-group.component.ts
@@ -10,7 +10,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[style.height.%]="100"
[style.background-color]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/radio-group-images.component.ts b/projects/common/components/input-elements/radio-group-images.component.ts
index f2fa7f08183f8f40f84018bf46d2f1c8546099c2..7a4d8b3fdb4bbda20e2151f462c9a4fae0a55032 100644
--- a/projects/common/components/input-elements/radio-group-images.component.ts
+++ b/projects/common/components/input-elements/radio-group-images.component.ts
@@ -20,7 +20,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
<aspect-text-image-panel class="radio-button-label"
[label]="option"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/slider.component.ts b/projects/common/components/input-elements/slider.component.ts
index 38e050e7ce0066c0ca98744fc1b56517cc95d5a5..833ff42074495e1bed751bb5ee7cb6f53a121a37 100644
--- a/projects/common/components/input-elements/slider.component.ts
+++ b/projects/common/components/input-elements/slider.component.ts
@@ -10,7 +10,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
[style.background-color]="elementModel.styling.backgroundColor">
<div *ngIf="elementModel.label"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
@@ -22,7 +21,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
<div *ngIf="elementModel.showValues"
class="min-value"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
@@ -33,7 +31,6 @@ import { FormElementComponent } from '../../directives/form-element-component.di
<div *ngIf="elementModel.showValues"
class="max-value"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
diff --git a/projects/common/components/input-elements/spell-correct.component.ts b/projects/common/components/input-elements/spell-correct.component.ts
index 710915ccb1753017028577da1c83442d043b94d4..12066561f1db6ea33a2606fa11026d071ea77047 100644
--- a/projects/common/components/input-elements/spell-correct.component.ts
+++ b/projects/common/components/input-elements/spell-correct.component.ts
@@ -25,7 +25,6 @@ import { TextInputComponent } from 'common/directives/text-input-component.direc
[style.text-align]="'center'"
[readonly]="elementModel.readOnly"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
@@ -41,7 +40,6 @@ import { TextInputComponent } from 'common/directives/text-input-component.direc
class="spell-correct-button"
[disabled]="elementModel.readOnly"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : '400'"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/text-area.component.ts b/projects/common/components/input-elements/text-area.component.ts
index c569f38a483fe80ce2c317e0f8d492a8157d7a4f..28a746d6c236ce60f8d48c1b4628cabcc9c6f340 100644
--- a/projects/common/components/input-elements/text-area.component.ts
+++ b/projects/common/components/input-elements/text-area.component.ts
@@ -16,7 +16,6 @@ import { TextInputComponent } from 'common/directives/text-input-component.direc
[style.min-height.%]="100"
aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/input-elements/text-field.component.ts b/projects/common/components/input-elements/text-field.component.ts
index 8c7d5ec9310c9a8a4d14962c490c090e81cd78b8..a8d946b9996a10ad3054d00f52e39bcac1385f3f 100644
--- a/projects/common/components/input-elements/text-field.component.ts
+++ b/projects/common/components/input-elements/text-field.component.ts
@@ -10,7 +10,6 @@ import { TextInputComponent } from 'common/directives/text-input-component.direc
[style.height.%]="100"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''"
diff --git a/projects/common/components/text/text.component.ts b/projects/common/components/text/text.component.ts
index e790564c38b47f98e25a81c53c3474fd19705358..d46af36d84a9ec179230eee573bcfb3a2b478c47 100644
--- a/projects/common/components/text/text.component.ts
+++ b/projects/common/components/text/text.component.ts
@@ -24,7 +24,6 @@ import { ElementComponent } from '../../directives/element-component.directive';
[class.delete-selection]="selectedColor === 'delete'"
[style.background-color]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor"
- [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize"
[style.line-height.%]="elementModel.styling.lineHeight"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
diff --git a/projects/common/models/elements/property-group-interfaces.ts b/projects/common/models/elements/property-group-interfaces.ts
index c7bd0fe06aa156e5a673f1852b0e86baf181c4af..7605b53a1a320afa6305142dac3a7d21b30ccdb0 100644
--- a/projects/common/models/elements/property-group-interfaces.ts
+++ b/projects/common/models/elements/property-group-interfaces.ts
@@ -176,7 +176,7 @@ export abstract class PropertyGroupGenerators {
static generateFontStylingProps(defaults: Partial<FontStyles> = {}): FontStyles {
return {
fontColor: defaults.fontColor !== undefined ? defaults.fontColor as string : '#000000',
- font: defaults?.font !== undefined ? defaults.font as string : 'Roboto',
+ font: defaults?.font !== undefined ? defaults.font as string : 'NunitoSans',
fontSize: defaults?.fontSize !== undefined ? defaults.fontSize as number : 20,
bold: defaults?.bold !== undefined ? defaults.bold as boolean : false,
italic: defaults?.italic !== undefined ? defaults.italic as boolean : false,
diff --git a/projects/editor/src/html_wrapper/index.html b/projects/editor/src/html_wrapper/index.html
index cd5e2fe955d45288a3202a08b2dff63930df223e..4d8e2701f9fcba38e2e79e53fd3017e271921299 100644
--- a/projects/editor/src/html_wrapper/index.html
+++ b/projects/editor/src/html_wrapper/index.html
@@ -56,7 +56,7 @@
</script>
<link rel="stylesheet" href="editor.css">
<link href="editor/assets/common-styles.css" rel="stylesheet">
- <link href="editor/assets/roboto.css" rel="stylesheet">
+ <link href="assets/nunitosans.css" rel="stylesheet">
<link href="editor/assets/ptsans.css" rel="stylesheet">
<link href="editor/assets/notoSansSymbols2.css" rel="stylesheet">
<link href="editor/assets/material-icons.css" rel="stylesheet">
diff --git a/projects/editor/src/index.html b/projects/editor/src/index.html
index 74a07b5ce5e2a8254ddb1bd6e489b4a10837389c..b5f69d844d7d430de7e92883a512c49b6b07d335 100644
--- a/projects/editor/src/index.html
+++ b/projects/editor/src/index.html
@@ -58,7 +58,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/common-styles.css" rel="stylesheet">
- <link href="assets/roboto.css" rel="stylesheet">
+ <link href="assets/nunitosans.css" rel="stylesheet">
<link href="assets/ptsans.css" rel="stylesheet">
<link href="assets/notoSansSymbols2.css" rel="stylesheet">
<link href="assets/material-icons.css" rel="stylesheet">
diff --git a/projects/editor/src/styles.css b/projects/editor/src/styles.css
index c8bcc934dbfa777f766114aa6d6269cb96fc6183..b7b845aa18b046f64472b6f2c22231e7d2f9f8d7 100644
--- a/projects/editor/src/styles.css
+++ b/projects/editor/src/styles.css
@@ -5,3 +5,8 @@ html, body { height: 100%; }
input[type=color] {
cursor: pointer;
}
+
+@font-face {
+ font-family: 'Nunito-Sans';
+ src: url('NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf');
+}
diff --git a/projects/player/modules/key-input/components/character-icon/character-icon.component.scss b/projects/player/modules/key-input/components/character-icon/character-icon.component.scss
index 1d8b6459736af078dd6ba9a5240605e1f7e1a5c8..ef13c6b8339b95a2afd60b0ac3fff767f0d5871a 100644
--- a/projects/player/modules/key-input/components/character-icon/character-icon.component.scss
+++ b/projects/player/modules/key-input/components/character-icon/character-icon.component.scss
@@ -1,3 +1,3 @@
:host {
- font-family: Roboto, sans-serif;
+ font-family: NunitoSans, sans-serif;
}
diff --git a/projects/player/src/html_wrapper/index.html b/projects/player/src/html_wrapper/index.html
index f458e37d2dbc9e8d8f47ca6c58a9838893692157..c33a119c762c7c24547aec7319e4bd229b10190e 100644
--- a/projects/player/src/html_wrapper/index.html
+++ b/projects/player/src/html_wrapper/index.html
@@ -44,7 +44,7 @@
</script>
<link rel="stylesheet" href="player.css">
<link href="player/assets/common-styles.css" rel="stylesheet">
- <link href="player/assets/roboto.css" rel="stylesheet">
+ <link href="assets/nunitosans.css" rel="stylesheet">
<link href="player/assets/ptsans.css" rel="stylesheet">
<link href="player/assets/notoSansSymbols2.css" rel="stylesheet">
<link href="player/assets/material-icons.css" rel="stylesheet">
diff --git a/projects/player/src/index.html b/projects/player/src/index.html
index b96340f93b89e11d54cd0a74ffc2821824aa8861..3b672801a6dc12091bda8836d042810cf0c07283 100644
--- a/projects/player/src/index.html
+++ b/projects/player/src/index.html
@@ -46,7 +46,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/common-styles.css" rel="stylesheet">
- <link href="assets/roboto.css" rel="stylesheet">
+ <link href="assets/nunitosans.css" rel="stylesheet">
<link href="assets/ptsans.css" rel="stylesheet">
<link href="assets/notoSansSymbols2.css" rel="stylesheet">
<link href="assets/material-icons.css" rel="stylesheet">