From b12ebb8d77d40f302585c8ea6798105a8e313cb8 Mon Sep 17 00:00:00 2001 From: Alex Balatsky Date: Fri, 20 Aug 2021 07:52:01 +0300 Subject: [PATCH] Fix font issues on Windows; manifest version parameterize --- manifest/base.json | 2 +- package.json | 2 +- public/manifest.json | 2 +- src/assets/scss/globals.scss | 4 +++- vite.config.js | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/manifest/base.json b/manifest/base.json index e5536f8..1f2fa33 100644 --- a/manifest/base.json +++ b/manifest/base.json @@ -3,7 +3,7 @@ "name": "Liberton", "description": "Liberton is free and safe non-custodial Free TON wallet.", "author": "Alex Balatsky", - "version": "1.1.2", + "version": "%version%", "icons": { "16": "favicon/favicon-16x16.png", "32": "favicon/favicon-32x32.png", diff --git a/package.json b/package.json index 5b923bc..f192ee1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liberton", - "version": "1.1.2", + "version": "1.1.3", "description": "Liberton is free and safe non-custodial Free TON wallet.", "scripts": { "serve": "vite preview", diff --git a/public/manifest.json b/public/manifest.json index e5536f8..612a6c0 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -3,7 +3,7 @@ "name": "Liberton", "description": "Liberton is free and safe non-custodial Free TON wallet.", "author": "Alex Balatsky", - "version": "1.1.2", + "version": "1.1.3", "icons": { "16": "favicon/favicon-16x16.png", "32": "favicon/favicon-32x32.png", diff --git a/src/assets/scss/globals.scss b/src/assets/scss/globals.scss index 822d085..c889be7 100644 --- a/src/assets/scss/globals.scss +++ b/src/assets/scss/globals.scss @@ -7,8 +7,8 @@ } html { + font-size: 16px; -webkit-font-smoothing: antialiased; - font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif; } body { @@ -46,8 +46,10 @@ main { #app { display: flex; + font-size: 1rem; min-height: 100vh; flex-direction: column; + font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif; } .container { diff --git a/vite.config.js b/vite.config.js index 8ac6b8b..48c246c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,8 +1,8 @@ import path from 'path' -import process from 'process' import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' import copy from 'rollup-plugin-copy' +import { version } from './package.json' import { base64 } from 'rollup-plugin-base64' export default defineConfig({ @@ -31,6 +31,8 @@ export default defineConfig({ dest: 'public', rename: 'manifest.json', src: `manifest/base.json`, + transform: (content) => + content.toString().replace('%version%', version), }, ], hook: 'buildStart',