From 6fee5d7deb01689c4e2ccfdd8f345023c568795e Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Tue, 5 May 2020 23:51:05 +0530 Subject: [PATCH] Fix font on macOS --- src/windows/about/about.css | 4 ++-- src/windows/checkUpdates/checkUpdates.css | 16 ++++++++-------- src/windows/customTheme/customTheme.css | 18 +++++++++--------- src/windows/main/main.css | 12 ++++++------ src/windows/settings/settings.css | 12 ++++++------ src/windows/themeManager/themeManager.css | 14 +++++++------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/windows/about/about.css b/src/windows/about/about.css index f5dda752..bf3d933b 100644 --- a/src/windows/about/about.css +++ b/src/windows/about/about.css @@ -8,7 +8,7 @@ body { } body { - font-family: 'Manrope', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: -apple-system, 'Manrope', BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; border: 1px solid var(--window-border); color: #ffffff; background: linear-gradient(to bottom right, #0b245f, #030e27); @@ -35,7 +35,7 @@ body { .title, .version, .tagline { - font-family: 'Manrope', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: -apple-system, 'Manrope', BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } .title { diff --git a/src/windows/checkUpdates/checkUpdates.css b/src/windows/checkUpdates/checkUpdates.css index 6a0d7fe9..cfa0cb7e 100644 --- a/src/windows/checkUpdates/checkUpdates.css +++ b/src/windows/checkUpdates/checkUpdates.css @@ -8,7 +8,7 @@ body { } body { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 1px solid var(--window-border); color: #ffffff; @@ -29,7 +29,7 @@ body { .title { font-weight: 700; font-size: 2.5rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff; border-bottom: 4px solid #b9b9b9de; @@ -48,7 +48,7 @@ body { .version, .release-notes-label { margin: 0.25rem 0; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 400; font-size: 1.3rem; @@ -57,7 +57,7 @@ body { .title { font-weight: 700; font-size: 2.5rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff; border-bottom: 4px solid #b9b9b9de; @@ -79,7 +79,7 @@ body { cursor: pointer; color: #fff; font-size: 1rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; width: -webkit-fill-available; -webkit-user-select: none; @@ -114,7 +114,7 @@ body { overflow-y: scroll; padding: 5px 10px; background: linear-gradient(-124deg, #3659aa, #0c2864); - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; position: relative; } @@ -171,7 +171,7 @@ a:hover { display: flex; align-items: center; font-size: 1.15rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } @@ -185,4 +185,4 @@ a:hover { .dropdown .item:hover { background: #2e8d44; -} +} \ No newline at end of file diff --git a/src/windows/customTheme/customTheme.css b/src/windows/customTheme/customTheme.css index e97504d5..10490294 100644 --- a/src/windows/customTheme/customTheme.css +++ b/src/windows/customTheme/customTheme.css @@ -8,7 +8,7 @@ body { } body { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 1px solid var(--window-border); background: linear-gradient(to bottom right, #1a1a1a, #0f1010) !important; @@ -27,7 +27,7 @@ body { .title { font-weight: 700; font-size: 2.5rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff; border-bottom: 4px solid #b9b9b9de; @@ -130,7 +130,7 @@ body { background: #15161d; color: #fff; flex: 1; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } @@ -154,7 +154,7 @@ body { font-size: 1.15rem; transition: background 0.35s; -webkit-user-select: none; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 0; color: #fff; @@ -205,7 +205,7 @@ body { .setting .label { flex-grow: 1; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } @@ -218,7 +218,7 @@ body { padding: 0.25rem 0.4rem; background: #222; color: #fff; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } @@ -227,7 +227,7 @@ body { padding: 0.25rem 0.4rem; background: #222; color: #fff; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } @@ -246,7 +246,7 @@ body { } ::-webkit-scrollbar-thumb { - background: rgba(36, 53, 90, 0.705); + background: rgba(36, 53, 90, 0.623); position: relative; } @@ -262,7 +262,7 @@ body { background: #101114; border: 1px solid #242525; font-size: 1rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 400; padding: 0.25rem 1rem; diff --git a/src/windows/main/main.css b/src/windows/main/main.css index fb7f6156..cd56f598 100644 --- a/src/windows/main/main.css +++ b/src/windows/main/main.css @@ -8,7 +8,7 @@ body { } body { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 1px solid var(--window-border); overflow: hidden; @@ -111,7 +111,7 @@ webview { .container>.title { text-align: center; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 2.65rem; margin: 15px 0; @@ -123,7 +123,7 @@ webview { } .label { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 1.25rem; text-align: left; @@ -216,7 +216,7 @@ webview { } .submit.button { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; cursor: pointer; background: #0960d1; @@ -321,7 +321,7 @@ input[type="search"]::-webkit-search-results-decoration { } .edit-popup-title { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff !important; margin: 0 !important; @@ -407,7 +407,7 @@ input[type="search"]::-webkit-search-results-decoration { } .prompt-button { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; padding: .75rem 1.5rem; font-size: 1.15rem; diff --git a/src/windows/settings/settings.css b/src/windows/settings/settings.css index 2a516bdc..4a552c23 100644 --- a/src/windows/settings/settings.css +++ b/src/windows/settings/settings.css @@ -8,7 +8,7 @@ body { } body { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 1px solid var(--window-border); background: linear-gradient(to bottom right, #1a1a1a, #0f1010) !important; @@ -45,7 +45,7 @@ body { margin-top: .5rem; font-weight: 500; font-size: 2.25rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff; padding-bottom: .15rem; @@ -80,14 +80,14 @@ body { } .setting-title { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 700; font-size: 1.45rem; } .setting-description { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 0.95rem; font-weight: 300; @@ -163,7 +163,7 @@ body { cursor: pointer; background: transparent; color: #fff; - font-family: 'Manrope', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: -apple-system, 'Manrope', BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } .footer button:focus { @@ -199,7 +199,7 @@ body { background: #101114; border: 1px solid #242525; font-size: 1rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 300; padding: 0.5rem 1rem; diff --git a/src/windows/themeManager/themeManager.css b/src/windows/themeManager/themeManager.css index 43e1fc7d..3a094d2a 100644 --- a/src/windows/themeManager/themeManager.css +++ b/src/windows/themeManager/themeManager.css @@ -8,7 +8,7 @@ body { } body { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; border: 1px solid var(--window-border); background: linear-gradient(to bottom right, #1a1a1a, #0f1010) !important; @@ -33,7 +33,7 @@ body { .title { font-weight: 700; font-size: 2.5rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff; border-bottom: 4px solid #b9b9b9de; @@ -75,7 +75,7 @@ body { } .theme .name { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 400; font-size: 1.65rem; @@ -114,7 +114,7 @@ body { color: #fff; font-size: 1rem; border: 0; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; position: absolute; bottom: 0; @@ -137,7 +137,7 @@ body { } .edit-popup-title { - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; color: #fff !important; margin: 0 !important; @@ -165,7 +165,7 @@ body { color: #fff; font-size: 1rem; font-weight: 400; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; width: -webkit-fill-available; } @@ -214,7 +214,7 @@ body { background: #101114; border: 1px solid #242525; font-size: 1rem; - font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + font-family: -apple-system, "Manrope", BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 300; padding: 0.5rem 1rem;