VUU-17: Refactor fonts

ScottLogic · Sep 7, 2023 · 9dd148b · 9dd148b
1 parent 4ca634d
commit 9dd148b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/vuu-ui/packages/vuu-popups/src/dialog/Dialog.css b/vuu-ui/packages/vuu-popups/src/dialog/Dialog.css
@@ -1,12 +1,3 @@
-@font-face {
-  font-family: 'Nunito Sans OTF';
-  src:
-      url('../../../vuu-shell/src/layout-management/NunitoSans-Regular.woff')
-      format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
-
 .vuuDialog {
   background: var(--salt-container-primary-background);
   border: var(--vuuDialog-border, solid 1px #ccc);
@@ -42,7 +33,7 @@
   align-items: flex-start;
   align-self: stretch;
   color: var(--light-text-primary, #15171B);
-  font-family: Nunito Sans OTF;
+  font-family: Nunito Sans Regular;
   font-feature-settings: 'ss02' on, 'ss01' on, 'salt' on, 'liga' off;
   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
@@ -8,16 +8,7 @@
   --salt-text-label-fontSize: 10px;
   --saltFormFieldLegacy-label-paddingLeft: 0;
   --saltFormField-label-fontWeight: 400;
-  font-family: Nunito Sans;
-}
-
-@font-face {
-  font-family: 'Nunito Sans';
-  src:
-      url('NunitoSans-Regular.woff') 
-      format('opentype');
-  font-weight: normal;
-  font-style: normal;
+  font-family: Nunito Sans Regular;
 }
 
 .saveLayoutPanel-panelContainer {

diff --git a/...layout-management/NunitoSans-Regular.woff → ...ackages/vuu-theme/NunitoSans-Regular.woff b/...layout-management/NunitoSans-Regular.woff → ...ackages/vuu-theme/NunitoSans-Regular.woff
diff --git a/vuu-ui/packages/vuu-theme/css/global.css b/vuu-ui/packages/vuu-theme/css/global.css
@@ -2,6 +2,15 @@
  * Have some global styles to simulate more realistic app. Currently only for Storybook.
  */
 
+ @font-face {
+  font-family: 'Nunito Sans Regular';
+  src:
+      url('../NunitoSans-Regular.woff') 
+      format('opentype');
+  font-weight: normal;
+  font-style: normal;
+}
+
  .vuu-theme {
   color: var(--salt-text-primary-foreground);
   font-family: var(--salt-typography-fontFamily);