Refactor font styling to use mixins scss file (#173)

* Refactor font styling to use mixins scss file * fix(typography): size adjustment * Merge branch 'suite' into fonts-refactor --------- Co-authored-by: Ayagoumi <[email protected]>
chain4travel · Nov 8, 2023 · d17c845 · d17c845
1 parent 3f73d40
commit d17c845
Show file tree

Hide file tree

Showing 144 changed files with 602 additions and 402 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/src/components/Access/AccountsFound.vue b/src/components/Access/AccountsFound.vue
@@ -71,18 +71,18 @@ export default class AccountsFound extends Vue {
 
 .savedAccounts {
     margin: 0;
-    font-family: ClashDisplay;
+    font-family: var(--primary-font);
     font-weight: 500;
     line-height: 1.5;
-    font-size: 1rem;
+    @include mixins.typography-body-2;
     margin-bottom: 0.5rem;
 }
 
 .v-icon {
     color: var(--primary-color);
     width: 20px;
     height: 20px;
-    font-size: 22px;
+    @include mixins.typography-subtitle-1;
 }
 
 .goTo {

diff --git a/src/components/CreateWalletWorkflow/CreateWallet.vue b/src/components/CreateWalletWorkflow/CreateWallet.vue
@@ -254,7 +254,7 @@ export default class CreateWallet extends Vue {
     h1 {
         margin-top: variables.$vertical-padding;
         text-align: left;
-        font-size: variables.$m-size;
+        @include mixins.typography-subtitle-1;
         font-weight: 400;
     }
 }
@@ -269,7 +269,7 @@ export default class CreateWallet extends Vue {
 
     > * {
         margin: 4px;
-        font-size: 0.8rem;
+        @include mixins.typography-caption;
     }
 
     p {
@@ -291,7 +291,7 @@ export default class CreateWallet extends Vue {
 
 .key_disp {
     margin: 30px auto;
-    font-size: 12px;
+    @include mixins.typography-caption;
 }
 
 a {
@@ -373,9 +373,7 @@ a {
     header {
         h1 {
             margin-top: 10px;
-            font-size: variables.$xl-size;
-            line-height: 1.25em;
-            font-weight: 400;
+            @include mixins.typography-headline-1;
         }
 
         p {
@@ -388,8 +386,7 @@ a {
 
         span {
             display: block;
-            font-size: variables.$s-size;
-            font-weight: 700;
+            @include mixins.typography-caption;
             text-transform: uppercase;
 
             &.label {
@@ -504,7 +501,7 @@ a {
 
         header {
             h1 {
-                font-size: variables.$xl-size-mobile;
+                @include mixins.typography-headline-4;
             }
         }
 

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
@@ -224,7 +224,7 @@ button {
     }
     .buts_right {
         button {
-            font-size: 11px;
+            @include mixins.typography-caption;
         }
     }
 }

diff --git a/src/components/NetworkSettings/CustomPage.vue b/src/components/NetworkSettings/CustomPage.vue
@@ -204,6 +204,7 @@ export default class CustomPage extends Vue {
 </script>
 <style scoped lang="scss">
 @use '../../styles/abstracts/variables';
+@use '../../styles/abstracts/mixins';
 
 .custom_network {
     padding: 0px 15px;
@@ -219,7 +220,7 @@ export default class CustomPage extends Vue {
     }
 
     button {
-        font-size: 12px;
+        @include mixins.typography-caption;
         padding: 3px 14px;
         border-radius: var(--border-radius-sm);
     }
@@ -228,7 +229,7 @@ export default class CustomPage extends Vue {
 form {
     margin-top: 12px;
     label {
-        font-size: 12px;
+        @include mixins.typography-caption;
     }
     > div {
         display: flex;
@@ -243,19 +244,19 @@ select {
     background-color: var(--bg-light);
     border-radius: var(--border-radius-sm);
     padding: 6px 6px;
-    font-size: 13px;
+    @include mixins.typography-caption;
     outline: none;
 }
 button {
     margin-top: 10px;
     width: 100%;
-    font-size: 12px;
+    @include mixins.typography-caption;
     border-radius: var(--border-radius-sm);
 }
 
 .v-btn {
     text-transform: none;
-    font-size: 12px !important;
+    @include mixins.typography-caption;
     color: var(--bg) !important;
 }
 
@@ -274,7 +275,7 @@ button {
 }
 
 .form_error {
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: #e03737;
 }
 </style>
diff --git a/src/components/NetworkSettings/EditPage.vue b/src/components/NetworkSettings/EditPage.vue
@@ -169,6 +169,7 @@ export default class EditPage extends Vue {
 </script>
 <style scoped lang="scss">
 @use '../../styles/abstracts/variables';
+@use '../../styles/abstracts/mixins';
 
 .custom_network {
     padding: 0px 15px;
@@ -184,7 +185,7 @@ export default class EditPage extends Vue {
     }
 
     button {
-        font-size: 12px;
+        @include mixins.typography-caption;
         padding: 3px 14px;
         border-radius: var(--border-radius-sm);
     }
@@ -193,7 +194,7 @@ export default class EditPage extends Vue {
 form {
     margin-top: 12px;
     label {
-        font-size: 12px;
+        @include mixins.typography-caption;
     }
     > div {
         display: flex;
@@ -208,7 +209,7 @@ select {
     color: var(--primary-color);
     border-radius: var(--border-radius-sm);
     padding: 6px 6px;
-    font-size: 13px;
+    @include mixins.typography-caption;
     outline: none;
     width: 100%;
 }
@@ -217,7 +218,7 @@ button {
     width: 100%;
     background-color: variables.$primary-color;
     color: #fff;
-    font-size: 12px;
+    @include mixins.typography-caption;
     padding: 3px 14px;
     border-radius: var(--border-radius-sm);
 }
@@ -241,7 +242,7 @@ button {
 }
 
 .form_error {
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: #e03737;
 }
 </style>
diff --git a/src/components/NetworkSettings/NetworkMenu.vue b/src/components/NetworkSettings/NetworkMenu.vue
@@ -240,7 +240,7 @@ export default class NetworkMenu extends Vue {
     }
 
     button {
-        font-size: 12px;
+        @include mixins.typography-caption;
         padding: 3px 14px;
         border-radius: var(--border-radius-sm);
     }

diff --git a/src/components/NetworkSettings/NetworkRow.vue b/src/components/NetworkSettings/NetworkRow.vue
@@ -109,8 +109,9 @@ export default class NetworkRow extends Vue {
 </script>
 <style scoped lang="scss">
 @use '../../styles/abstracts/variables';
+@use '../../styles/abstracts/mixins';
 .stat_col {
-    font-size: 14px;
+    @include mixins.typography-caption;
     color: var(--primary-color);
     text-align: right;
     word-break: keep-all !important;
@@ -153,7 +154,7 @@ img {
 .editBut {
     color: var(--primary-color);
     opacity: 0.4;
-    font-size: 11px;
+    @include mixins.typography-caption;
     /*position: absolute;*/
     /*top: 12px;*/
     /*right: 0px;*/
@@ -174,7 +175,7 @@ img {
 .url,
 .credentials {
     color: variables.$primary-color-light;
-    font-size: 12px;
+    @include mixins.typography-caption;
     word-break: break-all;
 }
 

diff --git a/src/components/NftCards/URL_NFT.vue b/src/components/NftCards/URL_NFT.vue
@@ -101,7 +101,7 @@ img {
 .type {
     display: block;
     margin: 0px auto !important;
-    font-size: 12px;
+    @include mixins.typography-caption;
     background-color: var(--primary-color-light);
     color: var(--bg) !important;
     width: max-content;
@@ -114,7 +114,7 @@ img {
 .unknown {
     padding: 10px;
     p {
-        font-size: 0.8rem;
+        @include mixins.typography-caption;
         color: #999;
         margin: 0;
     }
@@ -128,7 +128,7 @@ img {
         color: var(--primary-color-light);
         background-color: var(--bg-light);
         text-decoration: none;
-        font-size: 0.9rem;
+        @include mixins.typography-caption;
         margin: 0px auto;
 
         &:hover {

diff --git a/src/components/Notifications.vue b/src/components/Notifications.vue
@@ -24,7 +24,8 @@ export default {
     },
 }
 </script>
-<style scoped>
+<style scoped lang="scss">
+@use '../styles/abstracts/mixins';
 .notifications {
     pointer-events: none;
     position: fixed;
@@ -43,11 +44,10 @@ export default {
     box-shadow: 2px 2px 12px rgba(0, 0, 0, 0.4);
     background-color: var(--bg);
     max-width: 195px;
-    font-size: 13px !important;
+    @include mixins.typography-caption;
 }
 
 .notif_title {
-    /*font-size: 14px;*/
     color: var(--bg-light);
     font-weight: bold;
     padding: 6px 14px;

diff --git a/src/components/SidePanels/History/TxHistoryValueFunctional.vue b/src/components/SidePanels/History/TxHistoryValueFunctional.vue
@@ -79,18 +79,18 @@ export default {
 }
 
 .action {
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: variables.$primary-color-light;
 }
 .amount {
     text-align: right;
     white-space: nowrap;
-    font-size: 15px;
+    @include mixins.typography-body-2;
 }
 
 @include mixins.medium-device {
     .amount {
-        font-size: 14px;
+        @include mixins.typography-caption;
     }
 }
 </style>
diff --git a/src/components/SidePanels/History/ViewTypes/BaseTx.vue b/src/components/SidePanels/History/ViewTypes/BaseTx.vue
@@ -361,8 +361,9 @@ export default class BaseTx extends Vue {
 }
 </script>
 <style scoped lang="scss">
+@use '../../../../styles/abstracts/mixins';
 label {
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: var(--primary-color-light);
 }
 .nfts {
@@ -383,10 +384,10 @@ label {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: var(--primary-color-light);
     overflow: hidden;
-    font-family: 'Inter' sans-serif;
+    font-family: var(--primary-font);
     white-space: nowrap;
 
     p {

diff --git a/src/components/SidePanels/History/ViewTypes/BaseTxNFTOutput.vue b/src/components/SidePanels/History/ViewTypes/BaseTxNFTOutput.vue
@@ -63,10 +63,11 @@ export default class BaseTxNFTOutput extends Vue {
 }
 </script>
 <style scoped lang="scss">
+@use '../../../../styles/abstracts/mixins';
 .amount {
     text-align: right;
     white-space: nowrap;
-    font-size: 15px;
+    @include mixins.typography-body-2;
     color: #d04c4c;
 
     &[profit] {

diff --git a/src/components/SidePanels/History/ViewTypes/BaseTxOutput.vue b/src/components/SidePanels/History/ViewTypes/BaseTxOutput.vue
@@ -81,7 +81,7 @@ export default class BaseTxOutput extends Vue {
 .amount {
     text-align: right;
     white-space: nowrap;
-    font-size: 15px;
+    @include mixins.typography-body-2;
     color: #d04c4c;
 
     &.profit {
@@ -102,9 +102,7 @@ export default class BaseTxOutput extends Vue {
         overflow: hidden;
         color: var(--primary-color-light);
         white-space: nowrap;
-        font-size: 12px;
-        line-height: 12px;
-        font-family: 'Inter';
+        @include mixins.typography-caption;
         text-overflow: ellipsis;
     }
 
@@ -113,13 +111,13 @@ export default class BaseTxOutput extends Vue {
     }
 }
 label {
-    font-size: 12px;
+    @include mixins.typography-caption;
     color: var(--primary-color-light);
 }
 
 @include mixins.medium-device {
     .amount {
-        font-size: 13px;
+        @include mixins.typography-caption;
     }
 }
 </style>