Merge branch 'filter-fixes' into 'master'

get filter action descriptions on pref_filters class init instead of doing it...

See merge request tt-rss/tt-rss!78

10 files changed, 38 insertions, 7 deletions

diff --git a/themes/compact.css b/themes/compact.css
index b0330b885..3ee5a4a90 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -1151,7 +1151,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: #555;
+  color: #888888;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1510,6 +1510,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #555;
 }
+body.ttrss_prefs .text-muted {
+  color: #888888;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1964,6 +1967,7 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 12b94dc85..c62554e29 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -1151,7 +1151,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: #ccc;
+  color: #999999;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1510,6 +1510,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
+body.ttrss_prefs .text-muted {
+  color: #999999;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1866,6 +1869,7 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css
index 217d10eac..830b57f72 100644
--- a/themes/light-high-contrast.css
+++ b/themes/light-high-contrast.css
@@ -1151,7 +1151,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: black;
+  color: #333333;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1510,6 +1510,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: black;
 }
+body.ttrss_prefs .text-muted {
+  color: #333333;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1964,6 +1967,7 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
diff --git a/themes/light.css b/themes/light.css
index e7aa0c11e..33d137423 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -1151,7 +1151,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: #555;
+  color: #888888;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1510,6 +1510,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #555;
 }
+body.ttrss_prefs .text-muted {
+  color: #888888;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1964,6 +1967,7 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
diff --git a/themes/light/defines.less b/themes/light/defines.less
index 08896b4f1..37d1beadf 100644
--- a/themes/light/defines.less
+++ b/themes/light/defines.less
@@ -28,6 +28,8 @@
 @breakpoint-lg: 992px;
 @breakpoint-xl: 1200px;
 
+@fg-text-muted: lighten(@default-text, 20%);
+
 @embed-responsive-padding: 56.25%; // Use 56.25% for 16:9 aspect ratio, 75% for 4:3.
 
 body.ttrss_main,
diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index f29461530..fcdde88eb 100644
--- a/themes/light/dijit_basic.less
+++ b/themes/light/dijit_basic.less
@@ -151,6 +151,7 @@
 		.labelParam {
 			float: right;
 			margin-right: 16px;
+			text-align: right;
 		}
 
 		.dijitTreeRow.filterDisabled {
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index e13358956..849855796 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -9,6 +9,10 @@ body.ttrss_prefs {
 		color : @default-text;
 	}
 
+	.text-muted {
+		color : @fg-text-muted;
+	}
+
 	.dijitContentPane {
 		> h1:first-of-type,
 		> h2:first-of-type,
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 3896665c8..bb6ef9ef8 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -1348,7 +1348,7 @@ body.ttrss_main, body.ttrss_utility {
 	}
 
 	.text-muted {
-		color : @default-text;
+		color : @fg-text-muted;
 	}
 
 	.text-small, .small {
diff --git a/themes/night.css b/themes/night.css
index 33a239af0..81a1b444b 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -1152,7 +1152,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: #ccc;
+  color: #999999;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1511,6 +1511,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
+body.ttrss_prefs .text-muted {
+  color: #999999;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1867,6 +1870,7 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 6676426ef..16de963a3 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -1152,7 +1152,7 @@ body.ttrss_utility .text-warning {
 }
 body.ttrss_main .text-muted,
 body.ttrss_utility .text-muted {
-  color: #ccc;
+  color: #999999;
 }
 body.ttrss_main .text-small,
 body.ttrss_utility .text-small,
@@ -1511,6 +1511,9 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
+body.ttrss_prefs .text-muted {
+  color: #999999;
+}
 body.ttrss_prefs .dijitContentPane > h1:first-of-type,
 body.ttrss_prefs .dijitContentPane > h2:first-of-type,
 body.ttrss_prefs .dijitContentPane > h3:first-of-type {
@@ -1867,6 +1870,7 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .labelParam {
   float: right;
   margin-right: 16px;
+  text-align: right;
 }
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;