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

1 files changed, 5 insertions, 1 deletions

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;