VUU80: Fix font 'a' variation

ScottLogic · Nov 13, 2023 · 81fdd42 · 81fdd42
1 parent 2a2dd2f
commit 81fdd42
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 27 deletions.
diff --git a/vuu-ui/packages/vuu-popups/src/dialog-header/DialogHeader.css b/vuu-ui/packages/vuu-popups/src/dialog-header/DialogHeader.css
@@ -4,11 +4,12 @@
     --saltToolbar-background: transparent;
     --saltToolbar-height: calc(var(--salt-size-base) + 5px);
     --vuuToolbarProxy-height: 22px;
+    --salt-text-fontFamily: Nunito Sans A-Variant, sans-serif;
 
     display: flex;
     align-items: flex-start;
     color: var(--light-text-primary, #15171B);
-    font-feature-settings: 'ss02' on, 'ss01' on, 'salt' on, 'liga' off;
+    font-feature-settings: 'ss02' on, 'ss01' on, 'salt' on, 'liga' off !important;
     font-size: 16px;
     font-weight: 600;
 }

diff --git a/vuu-ui/packages/vuu-shell/src/layout-management/SaveLayoutPanel.css b/vuu-ui/packages/vuu-shell/src/layout-management/SaveLayoutPanel.css
@@ -36,13 +36,13 @@
 }
 
 .saveLayoutPanel-inputText {
+  border: none;
   color: var(--light-text-primary, #15171B);
-  font-family: "Nunito Sans", sans-serif;
+  font-family: Nunito Sans A-Variant, serif;
   font-feature-settings: 'ss02' on, 'ss01' on, 'salt' on, 'liga' off;
   font-size: 12px;
   font-weight: 400;
   line-height: 16px;
-  border: none;
   padding-left: 4px;
   width: 100%;
   outline: none;
@@ -95,7 +95,6 @@
   align-items: flex-start;
   gap: 8px;
   border-radius: 6px;
-  font-feature-settings: 'ss02' on, 'ss01' on, 'salt' on, 'liga' off;
   font-size: 12px;
   font-style: normal;
   font-weight: 700;

diff --git a/...ackages/vuu-theme/NunitoSans-Regular.woff → ...s/vuu-theme/fonts/NunitoSans-Regular.woff b/...ackages/vuu-theme/NunitoSans-Regular.woff → ...s/vuu-theme/fonts/NunitoSans-Regular.woff
diff --git a/vuu-ui/packages/vuu-theme/fonts/NunitoSans.css b/vuu-ui/packages/vuu-theme/fonts/NunitoSans.css
@@ -7,7 +7,9 @@
   font-display: swap;
   src: url(./NunitoSansv15Latin.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}  /* latin */
+}
+
+/* latin */
 @font-face {
   font-family: 'Nunito Sans';
   font-style: normal;
@@ -16,7 +18,9 @@
   font-display: swap;
   src: url(./NunitoSansv15Latin.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-} /* latin */
+}
+
+/* latin */
 @font-face {
   font-family: 'Nunito Sans';
   font-style: normal;
@@ -26,7 +30,8 @@
   src: url(./NunitoSansv15Latin.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
- /* latin */
+
+/* latin */
 @font-face {
   font-family: 'Nunito Sans';
   font-style: normal;
@@ -36,23 +41,31 @@
   src: url(./NunitoSansv15Latin.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
-  /* latin */
-  @font-face {
-    font-family: 'Nunito Sans';
-    font-style: normal;
-    font-weight: 700;
-    font-stretch: 100%;
-    font-display: swap;
-    src: url(./NunitoSansv15Latin.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }
-  /* latin */
-  @font-face {
-    font-family: 'Nunito Sans';
-    font-style: normal;
-    font-weight: 800;
-    font-stretch: 100%;
-    font-display: swap;
-    src: url(./NunitoSansv15Latin.woff2) format('woff2');
-    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-  }
+
+/* latin */
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(./NunitoSansv15Latin.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 800;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(./NunitoSansv15Latin.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* This font contains the variation of the 'a' character, which can be applied with `font-feature-settings` as per Figma */
+@font-face {
+  font-family: 'Nunito Sans A-Variant';
+  src: url('./NunitoSans-Regular.woff') format('opentype');
+}