Skip to content

Commit

Permalink
Merge pull request #494 from ZIMkaRU/feature/change-layout-fonts
Browse files Browse the repository at this point in the history
Change layout font family to prevent throwing error
  • Loading branch information
ezewer authored Feb 5, 2025
2 parents e6d8e28 + a80ee56 commit c339c0d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/auto-updater/toast-src/toast.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
body .swal2-container {
font-family: "Roboto", sans-serif;
font-family: "Inter", sans-serif;
font-feature-settings: 'tnum';
margin: 0;
}

Expand Down
6 changes: 3 additions & 3 deletions src/helpers/get-ui-fonts-as-css-string.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ const path = require('path')

const fontsPath = path.join(rootPath, 'bfx-report-ui/build/fonts/')
const fontsStyle = fs.readFileSync(
path.join(fontsPath, 'roboto.css'),
path.join(fontsPath, 'inter.css'),
'utf8'
)
const fStyleWithNormalizedPaths = fontsStyle.replace(
/url\(\.\/(.*\..*)\)/g,
`url(${fontsPath}$1)`
/url\('\.\/(.*\..*)'\)/g,
`url('${fontsPath}$1')`
)

module.exports = () => fStyleWithNormalizedPaths
3 changes: 2 additions & 1 deletion src/modal-dialog-src/modal-dialog.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
body .swal2-container {
font-family: "Roboto", sans-serif;
font-family: "Inter", sans-serif;
font-feature-settings: 'tnum';
}

body::-webkit-scrollbar,
Expand Down
5 changes: 3 additions & 2 deletions src/window-creators/layouts/app-init-error.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
<link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
<link href="../../../bfx-report-ui/build/fonts/inter.css" rel="stylesheet">
<title>Bitfinex Reports</title>
<style>
html {
Expand All @@ -20,7 +20,8 @@
justify-content: center;
text-align: center;
background-color: #172d3e;
font-family: "Roboto", sans-serif;
font-family: "Inter", sans-serif;
font-feature-settings: 'tnum';
}

.alert {
Expand Down
5 changes: 3 additions & 2 deletions src/window-creators/layouts/app-init.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../../../bfx-report-ui/build/favicon.ico">
<link href="../../../bfx-report-ui/build/fonts/roboto.css" rel="stylesheet">
<link href="../../../bfx-report-ui/build/fonts/inter.css" rel="stylesheet">
<title>Bitfinex Reports</title>
<style>
html {
Expand All @@ -19,7 +19,8 @@
margin: 0;
text-align: center;
background-color: #172d3e;
font-family: "Roboto", sans-serif;
font-family: "Inter", sans-serif;
font-feature-settings: 'tnum';
}

.win-control-btn {
Expand Down

0 comments on commit c339c0d

Please sign in to comment.