From 7ec8a6cad0878fd16fc63c9a11d9c7e3ca18a88c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Mar 2021 20:50:18 +0300 Subject: simplify feed tree expando/loading/feed icon handling --- themes/compact.css | 19 +++++++++++++------ themes/compact_night.css | 19 +++++++++++++------ themes/light.css | 19 +++++++++++++------ themes/light/tt-rss.less | 25 ++++++++++++++++++------- themes/night.css | 19 +++++++++++++------ themes/night_blue.css | 19 +++++++++++++------ 6 files changed, 83 insertions(+), 37 deletions(-) (limited to 'themes') diff --git a/themes/compact.css b/themes/compact.css index b94a91de5..e36f36ae6 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -511,16 +511,23 @@ body.ttrss_main #feeds-holder #feedTree { text-rendering: optimizelegibility; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { - left: -3px; - height: 22px; - position: relative; - top: -3px; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; cursor: pointer; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode { + opacity: 0; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode.visible { + opacity: 1; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { + left: -3px; + height: 20px; + width: 20px; + position: relative; + top: -2px; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { font-weight: bold; display: none; diff --git a/themes/compact_night.css b/themes/compact_night.css index 58e0973bb..676593d6c 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -511,16 +511,23 @@ body.ttrss_main #feeds-holder #feedTree { text-rendering: optimizelegibility; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { - left: -3px; - height: 22px; - position: relative; - top: -3px; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; cursor: pointer; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode { + opacity: 0; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode.visible { + opacity: 1; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { + left: -3px; + height: 20px; + width: 20px; + position: relative; + top: -2px; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { font-weight: bold; display: none; diff --git a/themes/light.css b/themes/light.css index 46a19904c..a25dfb410 100644 --- a/themes/light.css +++ b/themes/light.css @@ -511,16 +511,23 @@ body.ttrss_main #feeds-holder #feedTree { text-rendering: optimizelegibility; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { - left: -3px; - height: 22px; - position: relative; - top: -3px; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; cursor: pointer; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode { + opacity: 0; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode.visible { + opacity: 1; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { + left: -3px; + height: 20px; + width: 20px; + position: relative; + top: -2px; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { font-weight: bold; display: none; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 1d0564901..121cba56b 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -584,17 +584,28 @@ body.ttrss_main { font-family : @fonts-ui; .dijitTreeNode { - .loadingExpando { - left : -3px; - height : 22px; - position : relative; - top : -3px; - } - .dijitTreeRow { border : 1px solid transparent; cursor : pointer; + .loadingNode { + opacity : 0; + + &.visible { + opacity : 1; + } + } + + &.Is_Feed { + .loadingNode { + left : -3px; + height : 20px; + width : 20px; + position : relative; + top : -2px; + } + } + .counterNode { font-weight : bold; display : none; diff --git a/themes/night.css b/themes/night.css index ca1bbfc30..6aad81e82 100644 --- a/themes/night.css +++ b/themes/night.css @@ -512,16 +512,23 @@ body.ttrss_main #feeds-holder #feedTree { text-rendering: optimizelegibility; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { - left: -3px; - height: 22px; - position: relative; - top: -3px; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; cursor: pointer; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode { + opacity: 0; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode.visible { + opacity: 1; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { + left: -3px; + height: 20px; + width: 20px; + position: relative; + top: -2px; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { font-weight: bold; display: none; diff --git a/themes/night_blue.css b/themes/night_blue.css index 6afc478d2..174e66b3a 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -512,16 +512,23 @@ body.ttrss_main #feeds-holder #feedTree { text-rendering: optimizelegibility; font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { - left: -3px; - height: 22px; - position: relative; - top: -3px; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow { border: 1px solid transparent; cursor: pointer; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode { + opacity: 0; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNode.visible { + opacity: 1; +} +body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { + left: -3px; + height: 20px; + width: 20px; + position: relative; + top: -2px; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { font-weight: bold; display: none; -- cgit v1.2.3