yet another flex feedtree attemptexp-flex-feedtree

3 files changed, 35 insertions, 15 deletions

diff --git a/themes/light/defines.less b/themes/light/defines.less
index db86ee0c0..d591eedd9 100644
--- a/themes/light/defines.less
+++ b/themes/light/defines.less
@@ -1,3 +1,5 @@
+@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;
 
diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index 7e93975ba..f29461530 100644
--- a/themes/light/dijit_basic.less
+++ b/themes/light/dijit_basic.less
@@ -111,6 +111,17 @@
 			display : flex;
 			flex-direction : row;
 			align-items : center;
+
+			// AAAAAA (pushes element down)
+			.dijitTreeIcon {
+				font-size : inherit;
+				height : auto;
+			}
+
+			.dijitTreeExpando {
+				height : auto;
+				line-height : 0;
+			}
 		}
 
 		.dijitFolderClosed,
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 2d4a6f772..795b9589e 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -593,20 +593,16 @@ body.ttrss_main {
 				.dijitTreeRow {
 					border : 1px solid transparent;
 
-					.loadingNode {
-						display : none;
-
-						&.visible {
-							display : inline;
-						}
-					}
-
 					&.Is_Feed {
 						.loadingNode {
 							left : -2px;
 							height : 14px;
 							width : 14px;
 							position : relative;
+
+							&.visible {
+								content: url('../images/oval.svg?@{cache-version}');
+							}
 						}
 					}
 
@@ -615,6 +611,13 @@ body.ttrss_main {
 							height : 11px;
 							width : 18px;
 							margin-left : 4px;
+							position : relative;
+							top : 2px;
+
+							&.visible {
+								display : inline;
+								content: url('../images/three-dots.svg?@{cache-version}');
+							}
 						}
 					}
 
@@ -628,12 +631,12 @@ body.ttrss_main {
 						color : white;
 						background : lighten(@color-accent, 5%);
 						border-radius : 4px;
-						vertical-align : middle;
-						float : right;
-						position : relative;
+						//vertical-align : middle;
+						//float : right;
+						//position : relative;
 						line-height : 14px;
 						margin-right : 8px;
-						margin-top : 2px;
+						//margin-top : 2px;
 						min-width : 23px;
 						height : 14px;
 
@@ -666,7 +669,11 @@ body.ttrss_main {
 						cursor : pointer;
 						min-width : 0;
 						overflow : hidden;
-						text-overflow: ellipsis;
+						text-overflow : ellipsis;
+						position : relative;
+
+						// Segoe UI (@fonts-ui) seems to have wrong baseline set
+						top : -0.5px;
 
 						&.Unread {
 							font-weight : bold;
@@ -712,8 +719,8 @@ body.ttrss_main {
 					}
 
 					i.icon.icon-restore {
-						position : relative;
-						top : -1px;
+						//position : relative;
+						//top : -1px;
 						font-weight : bold;
 						color : @color-accent;
 					}