diff --git a/classes/feeds.php b/classes/feeds.php index f7a6aea7b..07677a8cd 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -408,7 +408,7 @@ class Feeds extends Handler_Protected { if (!$offset && $message) { $reply['content'] = "
$message"; - $reply['content'] .= "

"; + $reply['content'] .= "

"; $sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds WHERE owner_uid = ?"); @@ -428,7 +428,7 @@ class Feeds extends Handler_Protected { if ($num_errors > 0) { $reply['content'] .= "
"; - $reply['content'] .= "" . + $reply['content'] .= "" . __('Some feeds have update errors (click for details)') . ""; } $reply['content'] .= "

"; @@ -585,7 +585,7 @@ class Feeds extends Handler_Protected { $reply['headlines']['content'] = "
".__('No feed selected.'); - $reply['headlines']['content'] .= "

"; + $reply['headlines']['content'] .= "

"; $sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds WHERE owner_uid = ?"); @@ -605,7 +605,7 @@ class Feeds extends Handler_Protected { if ($num_errors > 0) { $reply['headlines']['content'] .= "
"; - $reply['headlines']['content'] .= "". + $reply['headlines']['content'] .= "". __('Some feeds have update errors (click for details)').""; } $reply['headlines']['content'] .= "

"; diff --git a/classes/handler/public.php b/classes/handler/public.php index a8f72e21c..9c6a94c12 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -613,7 +613,7 @@ class Handler_Public extends Handler {
- +
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index f9ba853f8..b7d4c3890 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1487,7 +1487,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"]).""; - print ""; + print ""; print make_local_datetime($line['last_article'], false); print ""; print ""; @@ -1544,7 +1544,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"]).": "; - print ""; + print ""; print htmlspecialchars($line["last_error"]); print ""; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f5a580e78..37a7236ee 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -148,7 +148,7 @@ class Pref_Filters extends Handler_Protected { $tmp = "
  • " . $line["title"] . "
    " . "" . $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16) . "" . - "
    " . $content_preview . "
    " . + "
    " . $content_preview . "
    " . "
  • "; array_push($rv, $tmp); diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index b611646a9..cb10e2322 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -685,7 +685,7 @@ class Pref_Prefs extends Handler_Protected { } if ($item['help_text']) - print "
    "; + print "
    "; print ""; } @@ -785,7 +785,7 @@ class Pref_Prefs extends Handler_Protected { print "
    -
    "; - print "
    " . smart_date_time(strtotime($line["updated"])) . "
    "; + print "
    " . smart_date_time(strtotime($line["updated"])) . "
    "; print ""; } diff --git a/prefs.php b/prefs.php index 8a7b788d7..38e201fec 100644 --- a/prefs.php +++ b/prefs.php @@ -153,13 +153,13 @@ ?> diff --git a/themes/night.css b/themes/night.css index 81ff1669c..a8b722157 100644 --- a/themes/night.css +++ b/themes/night.css @@ -1014,8 +1014,8 @@ body.ttrss_utility hr { border: 0px solid #ccc; border-bottom-width: 1px; } -body.ttrss_main .insensitive, -body.ttrss_utility .insensitive { +body.ttrss_main .text-muted, +body.ttrss_utility .text-muted { color: #ccc; } body.ttrss_main .small, @@ -1969,7 +1969,7 @@ body.flat.ttrss_main .dijitCheckBox:not(.dijitChecked)::before { color: #999999; background: #222; } -body.flat.ttrss_main .insensitive { +body.flat.ttrss_main .text-muted { color: #999999; } body.flat.ttrss_main .dijitAccordionInnerContainerSelected .dijitAccordionTitle { diff --git a/themes/night_base.less b/themes/night_base.less index 9e664fcd9..8e6755b64 100644 --- a/themes/night_base.less +++ b/themes/night_base.less @@ -12,7 +12,7 @@ @default-text: #ccc; -@fg-insensitive: darken(@default-text, 20%); +@fg-text-muted: darken(@default-text, 20%); @fg-light : lighten(@default-text, 10%); body.flat.ttrss_main.ttrss_prefs { @@ -26,7 +26,7 @@ body.flat.ttrss_main.ttrss_prefs { td.filename, div.prefHelp { - color : @fg-insensitive; + color : @fg-text-muted; } } @@ -157,7 +157,7 @@ body.flat.ttrss_main { } .author { - color : @fg-insensitive; + color : @fg-text-muted; } .updated, .content { @@ -198,12 +198,12 @@ body.flat.ttrss_main { } .dijitCheckBox:not(.dijitChecked)::before { - color : @fg-insensitive; + color : @fg-text-muted; background: @color-panel-bg; } - .insensitive { - color : @fg-insensitive; + .text-muted { + color : @fg-text-muted; } .dijitAccordionInnerContainerSelected .dijitAccordionTitle { diff --git a/themes/night_blue.css b/themes/night_blue.css index 4c8b679e9..f679b3176 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -1014,8 +1014,8 @@ body.ttrss_utility hr { border: 0px solid #ccc; border-bottom-width: 1px; } -body.ttrss_main .insensitive, -body.ttrss_utility .insensitive { +body.ttrss_main .text-muted, +body.ttrss_utility .text-muted { color: #ccc; } body.ttrss_main .small, @@ -1969,7 +1969,7 @@ body.flat.ttrss_main .dijitCheckBox:not(.dijitChecked)::before { color: #999999; background: #222; } -body.flat.ttrss_main .insensitive { +body.flat.ttrss_main .text-muted { color: #999999; } body.flat.ttrss_main .dijitAccordionInnerContainerSelected .dijitAccordionTitle {