From ceb8179ccc692430d52deb8e154e07a78569b412 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Mar 2021 16:33:03 +0300 Subject: [PATCH] don't use css-defined .svg files because firefox --- js/FeedTree.js | 8 ++++++-- themes/compact.css | 7 ------- themes/compact_night.css | 7 ------- themes/light.css | 7 ------- themes/light/defines.less | 2 -- themes/light/tt-rss.less | 9 --------- themes/night.css | 7 ------- themes/night_blue.css | 7 ------- 8 files changed, 6 insertions(+), 48 deletions(-) diff --git a/js/FeedTree.js b/js/FeedTree.js index bb9bd2b2e..185135ec6 100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -352,10 +352,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co if (treeNode) { treeNode = treeNode[0]; - if (show) + if (show) { treeNode.loadingNode.addClassName("visible"); - else + treeNode.loadingNode.setAttribute("src", + is_cat ? App.getInitParam("icon_three_dots") : App.getInitParam("icon_oval")); + } else { treeNode.loadingNode.removeClassName("visible"); + treeNode.loadingNode.setAttribute("src", App.getInitParam("icon_blank")) + } return true } diff --git a/themes/compact.css b/themes/compact.css index cf4b715c2..e2c9eec12 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -525,9 +525,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo width: 14px; position: relative; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616522734637'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; width: 18px; @@ -535,10 +532,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa position: relative; top: 2px; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { - display: inline; - content: url('../images/three-dots.svg?1616522734637'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; font-weight: bold; diff --git a/themes/compact_night.css b/themes/compact_night.css index fbde80a9c..007d74f88 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -525,9 +525,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo width: 14px; position: relative; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616522734715'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; width: 18px; @@ -535,10 +532,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa position: relative; top: 2px; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { - display: inline; - content: url('../images/three-dots.svg?1616522734715'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; font-weight: bold; diff --git a/themes/light.css b/themes/light.css index 9e501b161..2c6fb34f4 100644 --- a/themes/light.css +++ b/themes/light.css @@ -525,9 +525,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo width: 14px; position: relative; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616522734789'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; width: 18px; @@ -535,10 +532,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa position: relative; top: 2px; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { - display: inline; - content: url('../images/three-dots.svg?1616522734789'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; font-weight: bold; diff --git a/themes/light/defines.less b/themes/light/defines.less index 82705ac5e..921c10f1e 100644 --- a/themes/light/defines.less +++ b/themes/light/defines.less @@ -1,5 +1,3 @@ -@cache-version: `( new Date() ).getTime()`; - @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; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 789510b9b..e94aaa176 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -599,10 +599,6 @@ body.ttrss_main { height : 14px; width : 14px; position : relative; - - &.visible { - content: url('../images/oval.svg?@{cache-version}'); - } } } @@ -613,11 +609,6 @@ body.ttrss_main { margin-left : 4px; position : relative; top : 2px; - - &.visible { - display : inline; - content: url('../images/three-dots.svg?@{cache-version}'); - } } } diff --git a/themes/night.css b/themes/night.css index 6e7040205..b4a8aa753 100644 --- a/themes/night.css +++ b/themes/night.css @@ -526,9 +526,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo width: 14px; position: relative; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616522734913'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; width: 18px; @@ -536,10 +533,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa position: relative; top: 2px; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { - display: inline; - content: url('../images/three-dots.svg?1616522734913'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; font-weight: bold; diff --git a/themes/night_blue.css b/themes/night_blue.css index ccdd1cb5b..55bdbe941 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -526,9 +526,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .lo width: 14px; position: relative; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode.visible { - content: url('../images/oval.svg?1616522734858'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; width: 18px; @@ -536,10 +533,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa position: relative; top: 2px; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode.visible { - display: inline; - content: url('../images/three-dots.svg?1616522734858'); -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { order: 2; font-weight: bold;