diff --git a/src/renderer/components/+helm-releases/release-details/release-details.scss b/src/renderer/components/+helm-releases/release-details/release-details.scss
index 0a4acfcca3..780d3df401 100644
--- a/src/renderer/components/+helm-releases/release-details/release-details.scss
+++ b/src/renderer/components/+helm-releases/release-details/release-details.scss
@@ -66,7 +66,7 @@
.notes {
white-space: pre-line;
- font-family: "RobotoMono", monospace;
+ font-family: var(--font-monospace);
font-size: small;
}
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index 5669319d75..26d7aa360f 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -9,6 +9,7 @@
@import "~flex.box";
@import "../themes/theme-vars";
+@import "./fonts";
:root {
--unit: 8px;
@@ -17,7 +18,7 @@
--border-radius: 3px;
--font-main: 'Roboto', 'Helvetica', 'Arial', sans-serif;
--font-monospace: Lucida Console, Monaco, Consolas, monospace; // some defaults
- --font-terminal: var(--font-monospace); // overridden in terminal.ts
+ --font-terminal: var(--font-monospace); // overridden in terminal.ts, managed by common/user-store.ts
--font-size-small: calc(1.5 * var(--unit));
--font-size: calc(1.75 * var(--unit));
--font-size-big: calc(2 * var(--unit));
@@ -227,16 +228,19 @@ a {
}
}
-// import and preload all bundled fonts
-@import "fonts";
-
#fonts-preloading {
- > .icons {
- @include font-preload("Material Icons");
- }
+ > span {
+ position: absolute;
+ visibility: hidden;
+ height: 0;
- > .terminal {
- @include font-preload("RobotoMono");
+ &:before {
+ width: 0;
+ display: block;
+ overflow: hidden;
+ content: "text-example"; // some text required to start applying/rendering font in document
+ font-family: inherit; // font-family must be specified via style="" (see: template.html)
+ }
}
}
diff --git a/src/renderer/components/fonts.scss b/src/renderer/components/fonts.scss
index 91b65bc7c4..96f806c910 100644
--- a/src/renderer/components/fonts.scss
+++ b/src/renderer/components/fonts.scss
@@ -16,45 +16,45 @@
// Terminal fonts (monospaced)
// Source: https://fonts.google.com/?category=Monospace
@font-face {
- font-family: 'Anonymous Pro', monospace;
- src: local('Anonymous Pro'), url('../fonts/AnonymousPro-Regular.ttf') format('truetype');
+ font-family: "Anonymous Pro", monospace;
+ src: local("Anonymous Pro"), url("../fonts/AnonymousPro-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'IBM Plex Mono', monospace;
- src: local('IBM Plex Mono'), url('../fonts/IBMPlexMono-Regular.ttf') format('truetype');
+ font-family: "IBM Plex Mono", monospace;
+ src: local("IBM Plex Mono"), url("../fonts/IBMPlexMono-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'JetBrains Mono', monospace;
- src: local('JetBrains Mono'), url('../fonts/JetBrainsMono-Regular.ttf') format('truetype');
+ font-family: "JetBrains Mono", monospace;
+ src: local("JetBrains Mono"), url("../fonts/JetBrainsMono-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'Red Hat Mono', monospace;
- src: local('Red Hat Mono'), url('../fonts/RedHatMono-Regular.ttf') format('truetype');
+ font-family: "Red Hat Mono", monospace;
+ src: local("Red Hat Mono"), url("../fonts/RedHatMono-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'Source Code Pro', monospace;
- src: local('Source Code Pro'), url('../fonts/SourceCodePro-Regular.ttf') format('truetype');
+ font-family: "Source Code Pro", monospace;
+ src: local("Source Code Pro"), url("../fonts/SourceCodePro-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'Space Mono', monospace;
- src: local('Space Mono'), url('../fonts/SpaceMono-Regular.ttf') format('truetype');
+ font-family: "Space Mono", monospace;
+ src: local("Space Mono"), url("../fonts/SpaceMono-Regular.ttf") format("truetype");
font-display: block;
}
@font-face {
- font-family: 'Ubuntu Mono', monospace;
- src: local('Ubuntu Mono'), url('../fonts/UbuntuMono-Regular.ttf') format('truetype');
+ font-family: "Ubuntu Mono", monospace;
+ src: local("Ubuntu Mono"), url("../fonts/UbuntuMono-Regular.ttf") format("truetype");
font-display: block;
}
@@ -62,7 +62,7 @@
// RobotoMono Windows Compatible for using in terminal
// https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/RobotoMono
@font-face {
- font-family: 'RobotoMono', monospace;
- src: local('RobotoMono'), url('../fonts/roboto-mono-nerd.ttf') format('truetype');
+ font-family: "RobotoMono", monospace;
+ src: local("RobotoMono"), url("../fonts/roboto-mono-nerd.ttf") format("truetype");
font-display: block;
}
diff --git a/src/renderer/components/mixins.scss b/src/renderer/components/mixins.scss
index dd62568219..4581f0437b 100755
--- a/src/renderer/components/mixins.scss
+++ b/src/renderer/components/mixins.scss
@@ -59,20 +59,3 @@
@content; // css-modules (*.module.scss)
}
}
-
-// Makes custom @font-family available at earlier stages.
-// Element must exist in DOM as soon as possible to initiate preloading.
-@mixin font-preload($fontFamily) {
- position: absolute;
- visibility: hidden;
- height: 0;
-
- &:before {
- width: 0;
- display: block;
- overflow: hidden;
- content: "x"; // some text required to start applying font in document
- font-family: $fontFamily; // imported name in @font-face declaration
- @content;
- }
-}
diff --git a/src/renderer/template.html b/src/renderer/template.html
index 79014c6009..22af34b547 100755
--- a/src/renderer/template.html
+++ b/src/renderer/template.html
@@ -1,17 +1,24 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+