Revert "Revert "another attempt at flex-based feed tree""

This reverts commit 43744412f46d04cf2920264b4f9cc09b43d79924.

2 files changed, 22 insertions, 6 deletions

diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index 4f2faadcb..7e93975ba 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,6 +107,12 @@
 	}
 
 	.dijitTree {
+		.dijitTreeRowFlex {
+			display : flex;
+			flex-direction : row;
+			align-items : center;
+		}
+
 		.dijitFolderClosed,
 		.dijitFolderOpened {
 			display : none;
@@ -126,10 +132,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 53ad04d5b..2d4a6f772 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -603,11 +603,10 @@ body.ttrss_main {
 
 					&.Is_Feed {
 						.loadingNode {
-							left : 2px;
+							left : -2px;
 							height : 14px;
 							width : 14px;
 							position : relative;
-							top : -1px;
 						}
 					}
 
@@ -620,6 +619,7 @@ body.ttrss_main {
 					}
 
 					.counterNode {
+						order : 2;
 						font-weight : bold;
 						display : none;
 						font-size : @font-size-tiny;
@@ -655,8 +655,18 @@ 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;