From 19c277391eb27cc14595805b8815c8728a53f2e8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 23 Mar 2021 21:06:12 +0300 Subject: [PATCH] fonts-ui: add Cantarell --- themes/compact.css | 30 +++++++++++++++--------------- themes/compact_night.css | 30 +++++++++++++++--------------- themes/light.css | 30 +++++++++++++++--------------- themes/light/defines.less | 4 ++-- themes/night.css | 30 +++++++++++++++--------------- themes/night_blue.css | 30 +++++++++++++++--------------- 6 files changed, 77 insertions(+), 77 deletions(-) diff --git a/themes/compact.css b/themes/compact.css index fc822443b..cf4b715c2 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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -526,7 +526,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo position: relative; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616521489032'); + content: url('../images/oval.svg?1616522734637'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +537,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { display: inline; - content: url('../images/three-dots.svg?1616521489032'); + content: url('../images/three-dots.svg?1616522734637'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; @@ -1360,7 +1360,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1453,7 +1453,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1470,7 +1470,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1497,7 +1497,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: black; } @@ -1754,7 +1754,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1773,7 +1773,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } @@ -1862,7 +1862,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1886,7 +1886,7 @@ body.ttrss_utility.share_popup .content { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1904,7 +1904,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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 fd4b3baea..fbde80a9c 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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -526,7 +526,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo position: relative; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616521489086'); + content: url('../images/oval.svg?1616522734715'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +537,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { display: inline; - content: url('../images/three-dots.svg?1616521489087'); + content: url('../images/three-dots.svg?1616522734715'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; @@ -1360,7 +1360,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1453,7 +1453,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1470,7 +1470,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1497,7 +1497,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1764,7 +1764,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1788,7 +1788,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #d29745; @@ -1806,7 +1806,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1948,7 +1948,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1967,7 +1967,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } diff --git a/themes/light.css b/themes/light.css index 79cc68b7d..9e501b161 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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -526,7 +526,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo position: relative; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616521489161'); + content: url('../images/oval.svg?1616522734789'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +537,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { display: inline; - content: url('../images/three-dots.svg?1616521489161'); + content: url('../images/three-dots.svg?1616522734789'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; @@ -1360,7 +1360,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1453,7 +1453,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1470,7 +1470,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1497,7 +1497,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: black; } @@ -1754,7 +1754,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1773,7 +1773,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; } @@ -1862,7 +1862,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1886,7 +1886,7 @@ body.ttrss_utility.share_popup .content { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1904,7 +1904,7 @@ body.ttrss_utility.share_popup .content { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { diff --git a/themes/light/defines.less b/themes/light/defines.less index f18fb5822..82705ac5e 100644 --- a/themes/light/defines.less +++ b/themes/light/defines.less @@ -1,7 +1,7 @@ @cache-version: `( new Date() ).getTime()`; -@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; -@fonts-ui: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; +@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; @default-fg: black; @default-bg: white; diff --git a/themes/night.css b/themes/night.css index cff56f0c6..6e7040205 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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -527,7 +527,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo position: relative; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616521489269'); + content: url('../images/oval.svg?1616522734913'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -538,7 +538,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { display: inline; - content: url('../images/three-dots.svg?1616521489269'); + content: url('../images/three-dots.svg?1616522734913'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; @@ -1361,7 +1361,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1454,7 +1454,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1471,7 +1471,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1498,7 +1498,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1765,7 +1765,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1789,7 +1789,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #d29745; @@ -1807,7 +1807,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1949,7 +1949,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1968,7 +1968,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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 a2f3e53f9..ccdd1cb5b 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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; @@ -527,7 +527,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo position: relative; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616521489213'); + content: url('../images/oval.svg?1616522734858'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -538,7 +538,7 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { display: inline; - content: url('../images/three-dots.svg?1616521489213'); + content: url('../images/three-dots.svg?1616522734858'); } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; @@ -1361,7 +1361,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expanded.active .content, .cdm.expanded.Unread .content { @@ -1454,7 +1454,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable.Unread div.header a.title { color: black; @@ -1471,7 +1471,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .cdm.expandable:not(.active) { cursor: pointer; @@ -1498,7 +1498,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 600; color: #ccc; } @@ -1765,7 +1765,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitToolbar { font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; padding: 0; } .flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner { @@ -1789,7 +1789,7 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitMenu .dijitMenuItem .dijitMenuItemLabel { padding: 4px 8px; font-size: 13px; - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitMenu .dijitMenuItem.dijitDisabled:not(.dijitMenuItemSelected) .dijitMenuItemLabel { color: #2e99d1; @@ -1807,7 +1807,7 @@ body.ttrss_utility fieldset > label.checkbox { } .flat .dijitTab, .flat .dijitAccordionTitle { - font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } .flat .dijitTab i.material-icons, .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { @@ -1949,7 +1949,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; } body.ttrss_utility .content h2 { font-size: 18px; @@ -1968,7 +1968,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, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; margin: 10px 0 0 0; }