collapse actions summary list in filter tree if 'toggle rule display' is disabled, remove label-specific icon display, simplify markup

2 files changed, 22 insertions, 6 deletions

diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index fcdde88eb..caf1c5379 100644
--- a/themes/light/dijit_basic.less
+++ b/themes/light/dijit_basic.less
@@ -148,12 +148,6 @@
 			top : -2px;
 		}*/
 
-		.labelParam {
-			float: right;
-			margin-right: 16px;
-			text-align: right;
-		}
-
 		.dijitTreeRow.filterDisabled {
 			opacity : 0.5;
 
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index 849855796..b26ff646c 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -268,6 +268,15 @@ body.ttrss_prefs {
 			word-break : break-all;
 		}
 	}
+
+	ul.actions_summary {
+		float : right;
+		margin-right : 16px;
+		margin-top : 0;
+		list-style-type : none;
+		text-align : right;
+	}
+
 }
 
 body.ttrss_prefs,
@@ -315,4 +324,17 @@ body.ttrss_prefs[hide-filter-rules="true"] {
 	ul.filterRules {
 		display : none;
 	}
+
+	ul.actions_summary li {
+		display : inline;
+	}
+
+	ul.actions_summary li:after {
+		content: ", ";
+	}
+
+	ul.actions_summary li:last-child:after {
+		content: " ";
+	}
+
 }