From 49ef15f11dfbd53b27808e9a0949cf6825102126 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 Apr 2021 16:04:50 +0300 Subject: [PATCH] * fonts-ui: use system font family instead of segoe, etc. by name * disable segoe-specific baseline hack for the time being --- themes/compact.css | 27 +++++++++++++-------------- themes/compact_night.css | 27 +++++++++++++-------------- themes/light-high-contrast.css | 27 +++++++++++++-------------- themes/light.css | 27 +++++++++++++-------------- themes/light/cdm.less | 6 +++--- themes/light/defines.less | 3 +-- themes/light/prefs.less | 2 +- themes/light/tt-rss.less | 6 +++--- themes/light/utility.less | 4 ++-- themes/night.css | 27 +++++++++++++-------------- themes/night_blue.css | 27 +++++++++++++-------------- 11 files changed, 88 insertions(+), 95 deletions(-) diff --git a/themes/compact.css b/themes/compact.css index 1bbd2b67c..f6adece87 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -68,7 +68,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -289,7 +289,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -410,7 +410,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: #555; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -514,7 +514,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -574,7 +574,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1353,7 +1352,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1446,7 +1445,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1463,7 +1462,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1490,7 +1489,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #555; } @@ -1747,7 +1746,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #257aa7; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1766,7 +1765,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } @@ -1855,7 +1854,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1879,7 +1878,7 @@ body.ttrss_utility.share_popup .content { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1897,7 +1896,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { diff --git a/themes/compact_night.css b/themes/compact_night.css index 007d74f88..2436dd911 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -68,7 +68,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -289,7 +289,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -410,7 +410,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: #ccc; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -514,7 +514,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -574,7 +574,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1353,7 +1352,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1446,7 +1445,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1463,7 +1462,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1490,7 +1489,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1757,7 +1756,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1781,7 +1780,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #d29745; @@ -1799,7 +1798,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1941,7 +1940,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #b87d2c; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1960,7 +1959,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css index 2c6fb34f4..16ac51035 100644 --- a/themes/light-high-contrast.css +++ b/themes/light-high-contrast.css @@ -68,7 +68,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -289,7 +289,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -410,7 +410,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: black; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -514,7 +514,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -574,7 +574,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1353,7 +1352,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1446,7 +1445,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1463,7 +1462,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1490,7 +1489,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: black; } @@ -1747,7 +1746,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #257aa7; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1766,7 +1765,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } @@ -1855,7 +1854,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1879,7 +1878,7 @@ body.ttrss_utility.share_popup .content { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1897,7 +1896,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { diff --git a/themes/light.css b/themes/light.css index 2fc25d123..d26e5f81b 100644 --- a/themes/light.css +++ b/themes/light.css @@ -68,7 +68,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -289,7 +289,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -410,7 +410,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: #555; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -514,7 +514,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -574,7 +574,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1353,7 +1352,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1446,7 +1445,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1463,7 +1462,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1490,7 +1489,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #555; } @@ -1747,7 +1746,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #257aa7; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1766,7 +1765,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } @@ -1855,7 +1854,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1879,7 +1878,7 @@ body.ttrss_utility.share_popup .content { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1897,7 +1896,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { diff --git a/themes/light/cdm.less b/themes/light/cdm.less index 4bb1c6064..41d789a09 100644 --- a/themes/light/cdm.less +++ b/themes/light/cdm.less @@ -158,7 +158,7 @@ font-weight : 600; transition : color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family : @fonts-ui-bold; + font-family : @fonts-ui; } &.active, @@ -279,7 +279,7 @@ font-size : @font-size-content; transition : color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family : @fonts-ui-bold; + font-family : @fonts-ui; } &.Unread div.header a.title { @@ -301,7 +301,7 @@ font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: @fonts-ui-bold; + font-family: @fonts-ui; } } diff --git a/themes/light/defines.less b/themes/light/defines.less index 4097fad9f..08896b4f1 100644 --- a/themes/light/defines.less +++ b/themes/light/defines.less @@ -1,5 +1,4 @@ -@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; -@fonts-ui: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; +@fonts-ui: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; @default-fg: #555; @default-bg: white; diff --git a/themes/light/prefs.less b/themes/light/prefs.less index 0bea00b00..27e88d601 100644 --- a/themes/light/prefs.less +++ b/themes/light/prefs.less @@ -4,7 +4,7 @@ body.ttrss_prefs { font-size: @font-size-content; h1, h2, h3, h4 { - font-family : @fonts-ui-bold; + font-family : @fonts-ui; font-weight : 600; color : @default-text; } diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index e94aaa176..088a3c7ff 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -51,7 +51,7 @@ body.ttrss_main { font-size : 15px; font-weight : 600; text-rendering: optimizelegibility; - font-family : @fonts-ui-bold; + font-family : @fonts-ui; } } @@ -469,7 +469,7 @@ body.ttrss_main { font-size : 16px; font-weight : 600; color : @default-text; - font-family: @fonts-ui-bold; + font-family: @fonts-ui; } section, @@ -665,7 +665,7 @@ body.ttrss_main { position : relative; // Segoe UI (@fonts-ui) seems to have wrong baseline set - top : -0.5px; + // top : -0.5px; &.Unread { font-weight : bold; diff --git a/themes/light/utility.less b/themes/light/utility.less index c88e89ba9..89675ac13 100644 --- a/themes/light/utility.less +++ b/themes/light/utility.less @@ -21,7 +21,7 @@ body.ttrss_utility { h2, h3, h4 { color : @color-accent; - font-family: @fonts-ui-bold; + font-family: @fonts-ui; } h2 { @@ -46,7 +46,7 @@ body.ttrss_utility { h1 { color : gray; - font-family: @fonts-ui-bold; + font-family: @fonts-ui; font-size : 18px; margin : 10px 0 0 0; } diff --git a/themes/night.css b/themes/night.css index b4a8aa753..f5e23e59a 100644 --- a/themes/night.css +++ b/themes/night.css @@ -69,7 +69,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -290,7 +290,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -411,7 +411,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: #ccc; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -515,7 +515,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -575,7 +575,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1354,7 +1353,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1447,7 +1446,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1464,7 +1463,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1491,7 +1490,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1758,7 +1757,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1782,7 +1781,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #d29745; @@ -1800,7 +1799,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1942,7 +1941,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #b87d2c; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1961,7 +1960,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } diff --git a/themes/night_blue.css b/themes/night_blue.css index 55bdbe941..60293f52c 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -69,7 +69,7 @@ body.ttrss_main .post .header .title { font-size: 15px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .post div.content { padding: 10px; @@ -290,7 +290,7 @@ body.ttrss_main .hl .updated div { body.ttrss_main .hl div.title a { font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #555; } body.ttrss_main .hl a.title.high, @@ -411,7 +411,7 @@ body.ttrss_main .dijitDialog .dlgSecHoriz { font-size: 16px; font-weight: 600; color: #ccc; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main .dijitDialog section, body.ttrss_main .dijitDialog .dlgSecCont { @@ -515,7 +515,7 @@ body.ttrss_main #feeds-holder #feedTree { height: 100%; overflow-x: hidden; text-rendering: optimizelegibility; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -575,7 +575,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeL overflow: hidden; text-overflow: ellipsis; position: relative; - top: -0.5px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1354,7 +1353,7 @@ body.ttrss_utility hr { font-weight: 600; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1447,7 +1446,7 @@ body.ttrss_utility hr { font-size: 14px; transition: color 0.2s, background 0.2s; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1464,7 +1463,7 @@ body.ttrss_utility hr { font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1491,7 +1490,7 @@ body.ttrss_prefs h1, body.ttrss_prefs h2, body.ttrss_prefs h3, body.ttrss_prefs h4 { - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1758,7 +1757,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1782,7 +1781,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1800,7 +1799,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1942,7 +1941,7 @@ body.ttrss_utility .content h2, body.ttrss_utility .content h3, body.ttrss_utility .content h4 { color: #257aa7; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1961,7 +1960,7 @@ body.ttrss_utility a:focus { } body.ttrss_utility h1 { color: gray; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: system-ui, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; }