From 43744412f46d04cf2920264b4f9cc09b43d79924 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 21 Mar 2021 17:20:03 +0300 Subject: [PATCH] Revert "another attempt at flex-based feed tree" This reverts commit e12a6ca5409a77083758da4577b04d3b14d6232d. --- js/FeedTree.js | 2 +- themes/compact.css | 38 +++++++++-------------------------- themes/compact_night.css | 38 +++++++++-------------------------- themes/light.css | 38 +++++++++-------------------------- themes/light/dijit_basic.less | 14 ++++--------- themes/light/tt-rss.less | 14 ++----------- themes/night.css | 38 +++++++++-------------------------- themes/night_blue.css | 38 +++++++++-------------------------- 8 files changed, 52 insertions(+), 168 deletions(-) diff --git a/js/FeedTree.js b/js/FeedTree.js index 10d01131b..4c3c47daf 100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -202,7 +202,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co return (item.unread <= 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread"; }, getRowClass: function (item/*, opened */) { - let rc = "dijitTreeRow dijitTreeRowFlex"; + let rc = "dijitTreeRow"; const is_cat = String(item.id).indexOf('CAT:') != -1; diff --git a/themes/compact.css b/themes/compact.css index e9bdbd143..62cdd0839 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -526,10 +526,11 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNod display: inline; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { - left: -2px; + left: 2px; height: 14px; width: 14px; position: relative; + top: -1px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +538,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa margin-left: 4px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { - order: 2; font-weight: bold; display: none; font-size: 9px; @@ -569,17 +569,8 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-i background-color: #3ea447; border-color: #307f37; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeContent { - display: flex; - align-items: center; - flex-grow: 2; - min-width: 0; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel { cursor: pointer; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1829,16 +1820,12 @@ body.ttrss_utility.share_popup .content { border-width: 0; box-shadow: none; } -.flat { - /*#feedTree { - .dijitTreeContent .dijitInline { - vertical-align : baseline; - } - }*/ -} .flat li { padding: 2px; } +.flat #feedTree .dijitTreeContent .dijitInline { + vertical-align: baseline; +} .flat .dijitButton i.material-icons { position: relative; top: -1px; @@ -1910,17 +1897,6 @@ body.ttrss_utility.share_popup .content { .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { color: #257aa7; } -.flat .dijitTree { - /*.dijitTreeRow .dijitTreeExpando { - position : relative; - top : -2px; - }*/ -} -.flat .dijitTree .dijitTreeRowFlex { - display: flex; - flex-direction: row; - align-items: center; -} .flat .dijitTree .dijitFolderClosed, .flat .dijitTree .dijitFolderOpened { display: none; @@ -1934,6 +1910,10 @@ body.ttrss_utility.share_popup .content { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeRow .dijitTreeExpando { + position: relative; + top: -2px; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/compact_night.css b/themes/compact_night.css index 5510f9498..64e19c99c 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -526,10 +526,11 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNod display: inline; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { - left: -2px; + left: 2px; height: 14px; width: 14px; position: relative; + top: -1px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +538,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa margin-left: 4px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { - order: 2; font-weight: bold; display: none; font-size: 9px; @@ -569,17 +569,8 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-i background-color: #3ea447; border-color: #307f37; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeContent { - display: flex; - align-items: center; - flex-grow: 2; - min-width: 0; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel { cursor: pointer; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1731,16 +1722,12 @@ body.ttrss_utility fieldset > label.checkbox { display: inline; font-weight: normal; } -.flat { - /*#feedTree { - .dijitTreeContent .dijitInline { - vertical-align : baseline; - } - }*/ -} .flat li { padding: 2px; } +.flat #feedTree .dijitTreeContent .dijitInline { + vertical-align: baseline; +} .flat .dijitButton i.material-icons { position: relative; top: -1px; @@ -1812,17 +1799,6 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { color: #b87d2c; } -.flat .dijitTree { - /*.dijitTreeRow .dijitTreeExpando { - position : relative; - top : -2px; - }*/ -} -.flat .dijitTree .dijitTreeRowFlex { - display: flex; - flex-direction: row; - align-items: center; -} .flat .dijitTree .dijitFolderClosed, .flat .dijitTree .dijitFolderOpened { display: none; @@ -1836,6 +1812,10 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeRow .dijitTreeExpando { + position: relative; + top: -2px; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/light.css b/themes/light.css index 419a3fe8d..dbe31763a 100644 --- a/themes/light.css +++ b/themes/light.css @@ -526,10 +526,11 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNod display: inline; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { - left: -2px; + left: 2px; height: 14px; width: 14px; position: relative; + top: -1px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -537,7 +538,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa margin-left: 4px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { - order: 2; font-weight: bold; display: none; font-size: 9px; @@ -569,17 +569,8 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-i background-color: #3ea447; border-color: #307f37; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeContent { - display: flex; - align-items: center; - flex-grow: 2; - min-width: 0; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel { cursor: pointer; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1829,16 +1820,12 @@ body.ttrss_utility.share_popup .content { border-width: 0; box-shadow: none; } -.flat { - /*#feedTree { - .dijitTreeContent .dijitInline { - vertical-align : baseline; - } - }*/ -} .flat li { padding: 2px; } +.flat #feedTree .dijitTreeContent .dijitInline { + vertical-align: baseline; +} .flat .dijitButton i.material-icons { position: relative; top: -1px; @@ -1910,17 +1897,6 @@ body.ttrss_utility.share_popup .content { .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { color: #257aa7; } -.flat .dijitTree { - /*.dijitTreeRow .dijitTreeExpando { - position : relative; - top : -2px; - }*/ -} -.flat .dijitTree .dijitTreeRowFlex { - display: flex; - flex-direction: row; - align-items: center; -} .flat .dijitTree .dijitFolderClosed, .flat .dijitTree .dijitFolderOpened { display: none; @@ -1934,6 +1910,10 @@ body.ttrss_utility.share_popup .content { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeRow .dijitTreeExpando { + position: relative; + top: -2px; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less index 7e93975ba..4f2faadcb 100644 --- a/themes/light/dijit_basic.less +++ b/themes/light/dijit_basic.less @@ -4,11 +4,11 @@ padding: 2px; } - /*#feedTree { + #feedTree { .dijitTreeContent .dijitInline { vertical-align : baseline; } - }*/ + } .dijitButton i.material-icons { position: relative; @@ -107,12 +107,6 @@ } .dijitTree { - .dijitTreeRowFlex { - display : flex; - flex-direction : row; - align-items : center; - } - .dijitFolderClosed, .dijitFolderOpened { display : none; @@ -132,10 +126,10 @@ color : white; } - /*.dijitTreeRow .dijitTreeExpando { + .dijitTreeRow .dijitTreeExpando { position : relative; top : -2px; - }*/ + } .labelParam { float: right; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 2d4a6f772..53ad04d5b 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -603,10 +603,11 @@ body.ttrss_main { &.Is_Feed { .loadingNode { - left : -2px; + left : 2px; height : 14px; width : 14px; position : relative; + top : -1px; } } @@ -619,7 +620,6 @@ body.ttrss_main { } .counterNode { - order : 2; font-weight : bold; display : none; font-size : @font-size-tiny; @@ -655,18 +655,8 @@ body.ttrss_main { border-color: darken(@color-checked, 25%); } - .dijitTreeContent { - display : flex; - align-items : center; - flex-grow : 2; - min-width : 0; - } - .dijitTreeLabel { cursor : pointer; - min-width : 0; - overflow : hidden; - text-overflow: ellipsis; &.Unread { font-weight : bold; diff --git a/themes/night.css b/themes/night.css index a7e8db4c9..663a49811 100644 --- a/themes/night.css +++ b/themes/night.css @@ -527,10 +527,11 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNod display: inline; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { - left: -2px; + left: 2px; height: 14px; width: 14px; position: relative; + top: -1px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -538,7 +539,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa margin-left: 4px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { - order: 2; font-weight: bold; display: none; font-size: 9px; @@ -570,17 +570,8 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-i background-color: #3ea447; border-color: #307f37; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeContent { - display: flex; - align-items: center; - flex-grow: 2; - min-width: 0; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel { cursor: pointer; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1732,16 +1723,12 @@ body.ttrss_utility fieldset > label.checkbox { display: inline; font-weight: normal; } -.flat { - /*#feedTree { - .dijitTreeContent .dijitInline { - vertical-align : baseline; - } - }*/ -} .flat li { padding: 2px; } +.flat #feedTree .dijitTreeContent .dijitInline { + vertical-align: baseline; +} .flat .dijitButton i.material-icons { position: relative; top: -1px; @@ -1813,17 +1800,6 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { color: #b87d2c; } -.flat .dijitTree { - /*.dijitTreeRow .dijitTreeExpando { - position : relative; - top : -2px; - }*/ -} -.flat .dijitTree .dijitTreeRowFlex { - display: flex; - flex-direction: row; - align-items: center; -} .flat .dijitTree .dijitFolderClosed, .flat .dijitTree .dijitFolderOpened { display: none; @@ -1837,6 +1813,10 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeRow .dijitTreeExpando { + position: relative; + top: -2px; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px; diff --git a/themes/night_blue.css b/themes/night_blue.css index bce609ef4..f8d0096f3 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -527,10 +527,11 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .loadingNod display: inline; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Feed .loadingNode { - left: -2px; + left: 2px; height: 14px; width: 14px; position: relative; + top: -1px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loadingNode { height: 11px; @@ -538,7 +539,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow.Is_Cat .loa margin-left: 4px; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .counterNode { - order: 2; font-weight: bold; display: none; font-size: 9px; @@ -570,17 +570,8 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow[data-feed-i background-color: #3ea447; border-color: #307f37; } -body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeContent { - display: flex; - align-items: center; - flex-grow: 2; - min-width: 0; -} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel { cursor: pointer; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; } body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow .dijitTreeLabel.Unread { font-weight: bold; @@ -1732,16 +1723,12 @@ body.ttrss_utility fieldset > label.checkbox { display: inline; font-weight: normal; } -.flat { - /*#feedTree { - .dijitTreeContent .dijitInline { - vertical-align : baseline; - } - }*/ -} .flat li { padding: 2px; } +.flat #feedTree .dijitTreeContent .dijitInline { + vertical-align: baseline; +} .flat .dijitButton i.material-icons { position: relative; top: -1px; @@ -1813,17 +1800,6 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitAccordionInnerContainer:not(.dijitSelected) i.material-icons { color: #257aa7; } -.flat .dijitTree { - /*.dijitTreeRow .dijitTreeExpando { - position : relative; - top : -2px; - }*/ -} -.flat .dijitTree .dijitTreeRowFlex { - display: flex; - flex-direction: row; - align-items: center; -} .flat .dijitTree .dijitFolderClosed, .flat .dijitTree .dijitFolderOpened { display: none; @@ -1837,6 +1813,10 @@ body.ttrss_utility fieldset > label.checkbox { .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected { color: white; } +.flat .dijitTree .dijitTreeRow .dijitTreeExpando { + position: relative; + top: -2px; +} .flat .dijitTree .labelParam { float: right; margin-right: 16px;