removed more hardcoded font names

updated changelog
Nexus-Mods · Jul 16, 2024 · 6bb42b7 · 6bb42b7
1 parent 7f773d9
commit 6bb42b7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Common Changelog](https://common-changelog.org/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.12.0-beta.2] - 2024-xx-xx
+
+- Removed some old hardcoded font names
+
 ## [1.12.0-beta.1] - 2024-07-16
 
-- Set Inter as new default font
+- Set Inter as new default font to align with site design system
 - Added Mods of the Month to Dashboard. ([#15930](https://github.com/Nexus-Mods/Vortex/issues/15930))
 - Fixed build issues with node 18.20 and above. ([#15950](https://github.com/Nexus-Mods/Vortex/issues/15950))
 - Fixed inability to download files from Google Drive. ([#15893](https://github.com/Nexus-Mods/Vortex/issues/15893))

diff --git a/src/extensions/nexus_integration/views/LoginIcon.tsx b/src/extensions/nexus_integration/views/LoginIcon.tsx
@@ -96,7 +96,7 @@ class LoginIcon extends ComponentEx<IProps, {}> {
     if (this.isLoggedIn()) {
       return (
           <div id='membership-status' className={classes}>
-             {membership}
+             <div className='membership-status-text'>{membership}</div>
           </div>
       );
     } else {

diff --git a/src/stylesheets/vortex/dashlet.scss b/src/stylesheets/vortex/dashlet.scss
@@ -556,7 +556,7 @@
 }
 
 .onboarding-card-title {
-  font-family: 'Montserrat';
+  font-family: $font-family-base;
   text-transform: uppercase;
   font-size: 1em;
   font-weight: 600;
@@ -632,7 +632,7 @@
 }
 
 .onboarding-completed-card-header-text {
-  font-family: 'Montserrat';
+  font-family: $font-family-base;
 }
 
 .onboarding-completed-card-header-icon {

diff --git a/src/stylesheets/vortex/main-window.scss b/src/stylesheets/vortex/main-window.scss
@@ -93,11 +93,11 @@
       align-items: center;
       gap: 4px;
       text-transform: uppercase;
-      font-family: 'Montserrat';
+      font-family: $font-family-base;
       font-size: 0.8em;
 
       .toolbar-version-text {
-        margin: 2px 0 0 0;
+        margin: 1px 0 0 0;
       }
     }
   }
@@ -393,31 +393,35 @@
   }
 
   .membership-status {
-    display: inline-block;
-    padding: 2px 8px;
-    border-radius: 20px;
+
     width: fit-content;
-    text-transform: uppercase;
-    font-size: smaller;
-    margin-right: 8px;   
+    margin-right: 8px; 
 
+    border-radius: 24px;
+    border: none;
+    padding: 4px 10px;
+    font-weight: 800;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    text-transform: uppercase;
+    font-family: $font-family-base;
+    font-size: 0.8em;
     background-color: white;
     color: black;
-    border: none;
-    font-weight: 700;
+
+    .membership-status-text {
+      margin: 2px 0 0 0;
+    }    
 
     &.premium {
       background-color: $brand-primary;
       color: black;
-      border: none;
-      font-weight: 800; 
     }
 
     &.supporter {
       background-color: black;
-      color: white;   
-      border: 1px solid white;  
-      font-weight: 700; 
+      color: white;    
     }
   }
 }

diff --git a/src/stylesheets/vortex/roboto.scss b/src/stylesheets/vortex/roboto.scss
@@ -141,74 +141,4 @@
   font-style: italic;
   font-weight: 900;
   src: local('Roboto-BlackItalic'), url(assets/fonts/Roboto-BlackItalic.ttf) format('truetype');
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*
-
-
-
-
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: normal;
-  src: local('Roboto'), local('Roboto-Regular'), url(assets/fonts/roboto.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: bold;
-  font-weight: 800;
-  src: local('Roboto-Black'), url(assets/fonts/Roboto-Black.ttf) format('truetype');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: bold;
-  font-weight: bold;
-  src: local('Roboto-Bold'), url(assets/fonts/Roboto-Bold.ttf) format('truetype');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 100;
-  src: local('Roboto-Thin'), url(assets/fonts/Roboto-Thin.ttf) format('truetype');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 500;
-  src: local('Roboto-Medium'), url(assets/fonts/Roboto-Medium.ttf) format('truetype');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: italic;
-  font-weight: normal;
-  src: local('Roboto-Italic'), url(assets/fonts/Roboto-Italic.ttf) format('truetype');
-}
-
-@font-face {
-  font-family: 'Roboto';
-  font-style: italic;
-  font-weight: 500;
-  src: local('Roboto-MediumItalic'), url(assets/fonts/Roboto-MediumItalic.ttf) format('truetype');
-}*/
+}