diff --git a/classes/feeds.php b/classes/feeds.php index a90b1c8ed..dfb3a4b26 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -82,7 +82,7 @@ class Feeds extends Handler_Protected { - "; + "; $reply .= ""; @@ -347,24 +347,24 @@ class Feeds extends Handler_Protected { if ($line["marked"] == "t" || $line["marked"] == "1") { $marked_pic = "link, 'images/mark_set.png')."\" + src=\"".theme_image($this->link, 'images/mark_set.svg')."\" class=\"markedPic\" alt=\"Unstar article\" onclick='javascript:toggleMark($id)'>"; } else { $marked_pic = "link, 'images/mark_unset.png')."\" + src=\"".theme_image($this->link, 'images/mark_unset.svg')."\" class=\"markedPic\" alt=\"Star article\" onclick='javascript:toggleMark($id)'>"; } if ($line["published"] == "t" || $line["published"] == "1") { $published_pic = "link, - 'images/pub_set.png')."\" + 'images/pub_set.svg')."\" class=\"markedPic\" alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>"; } else { $published_pic = "link, - 'images/pub_unset.png')."\" + 'images/pub_unset.svg')."\" class=\"markedPic\" alt=\"Publish article\" onclick='javascript:togglePub($id)'>"; } @@ -418,7 +418,7 @@ class Feeds extends Handler_Protected { if ($has_feed_icon) { $feed_icon_img = "\"\""; } else { - $feed_icon_img = "\"\""; + $feed_icon_img = "\"\""; } if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) { @@ -626,7 +626,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= " "; $reply['content'] .= ""; - $reply['content'] .= ""; + $reply['content'] .= ""; $reply['content'] .= ""; } diff --git a/images/art-set-unread.png b/images/art-set-unread.png deleted file mode 100644 index bc1adf2e3..000000000 Binary files a/images/art-set-unread.png and /dev/null differ diff --git a/images/down_arrow.png b/images/down_arrow.png deleted file mode 100644 index 8af311981..000000000 Binary files a/images/down_arrow.png and /dev/null differ diff --git a/images/feed-icon-12x12.png b/images/feed-icon-12x12.png deleted file mode 100644 index 0622c661c..000000000 Binary files a/images/feed-icon-12x12.png and /dev/null differ diff --git a/images/feed-icon-64x64.png b/images/feed-icon-64x64.png deleted file mode 100644 index ff8b85d25..000000000 Binary files a/images/feed-icon-64x64.png and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 320c20caf..000000000 Binary files a/images/logo.png and /dev/null differ diff --git a/images/logo_big.png b/images/logo_big.png deleted file mode 100644 index 09e2f4514..000000000 Binary files a/images/logo_big.png and /dev/null differ diff --git a/images/mark_set.png b/images/mark_set.png deleted file mode 100644 index ed0473f1c..000000000 Binary files a/images/mark_set.png and /dev/null differ diff --git a/images/mark_unset.png b/images/mark_unset.png deleted file mode 100644 index 04f6ea4f0..000000000 Binary files a/images/mark_unset.png and /dev/null differ diff --git a/images/mark_unset.svg b/images/mark_unset.svg index 15e582d3b..4b31d31c4 100644 --- a/images/mark_unset.svg +++ b/images/mark_unset.svg @@ -1,23 +1,24 @@ + + inkscape:export-ydpi="90.000000" + version="1.1"> + inkscape:guide-bbox="true" + showgrid="false" + inkscape:window-maximized="0" /> @@ -55,7 +58,7 @@ id="layer1"> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/pub_unset.png b/images/pub_unset.png deleted file mode 100644 index 58a3cd355..000000000 Binary files a/images/pub_unset.png and /dev/null differ diff --git a/images/pub_unset.svg b/images/pub_unset.svg new file mode 100644 index 000000000..dce9535fd --- /dev/null +++ b/images/pub_unset.svg @@ -0,0 +1,169 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/sign_excl.png b/images/sign_excl.png deleted file mode 100644 index d3e00ced6..000000000 Binary files a/images/sign_excl.png and /dev/null differ diff --git a/images/sign_excl.svg b/images/sign_excl.svg new file mode 100644 index 000000000..962014c70 --- /dev/null +++ b/images/sign_excl.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ! + + diff --git a/images/sign_info.png b/images/sign_info.png deleted file mode 100644 index c2ae16a67..000000000 Binary files a/images/sign_info.png and /dev/null differ diff --git a/images/sign_info.svg b/images/sign_info.svg new file mode 100644 index 000000000..8312bfa11 --- /dev/null +++ b/images/sign_info.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + i + + diff --git a/images/sign_quest.png b/images/sign_quest.png deleted file mode 100644 index 3c2c93ec0..000000000 Binary files a/images/sign_quest.png and /dev/null differ diff --git a/images/sign_quest.svg b/images/sign_quest.svg new file mode 100644 index 000000000..acd563638 --- /dev/null +++ b/images/sign_quest.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ? + + diff --git a/images/small_question.png b/images/small_question.png deleted file mode 100644 index 7b9cfde7c..000000000 Binary files a/images/small_question.png and /dev/null differ diff --git a/include/feedbrowser.php b/include/feedbrowser.php index 002e2511f..9c53e3df4 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -63,7 +63,7 @@ htmlspecialchars($line["title"]).""; $feed_url = ""; $rv .= "
  • $check_box $feed_url $site_url". @@ -92,7 +92,7 @@ htmlspecialchars($line["title"]).""; $feed_url = ""; diff --git a/include/functions.php b/include/functions.php index cd39789ab..1db3b117c 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1870,10 +1870,10 @@ return "images/archive.png"; break; case -1: - return "images/mark_set.png"; + return "images/mark_set.svg"; break; case -2: - return "images/pub_set.png"; + return "images/pub_set.svg"; break; case -3: return "images/fresh.png"; @@ -1939,8 +1939,8 @@ $params["sign_progress"] = theme_image($link, "images/indicator_white.gif"); $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif"); - $params["sign_excl"] = theme_image($link, "images/sign_excl.png"); - $params["sign_info"] = theme_image($link, "images/sign_info.png"); + $params["sign_excl"] = theme_image($link, "images/sign_excl.svg"); + $params["sign_info"] = theme_image($link, "images/sign_info.svg"); foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS", "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP", @@ -2814,19 +2814,19 @@ function format_warning($msg, $id = "") { global $link; return "
    - $msg
    "; + $msg"; } function format_notice($msg, $id = "") { global $link; return "
    - $msg
    "; + $msg"; } function format_error($msg, $id = "") { global $link; return "
    - $msg
    "; + $msg"; } function print_notice($msg) { @@ -3090,7 +3090,7 @@ $rv['content'] .= " "; $rv['content'] .= ""; - $rv['content'] .= ""; + $rv['content'] .= ""; $rv['content'] .= ""; } diff --git a/plugins/digest/digest.js b/plugins/digest/digest.js index 522d35453..a9b3508c7 100644 --- a/plugins/digest/digest.js +++ b/plugins/digest/digest.js @@ -252,14 +252,14 @@ function view(article_id) { } if (article.marked) - mark_part = ""; + mark_part = ""; else - mark_part = ""; + mark_part = ""; if (article.published) - publ_part = ""; + publ_part = ""; else - publ_part = ""; + publ_part = ""; var tmp = "
    " + "
    " + @@ -385,10 +385,10 @@ function get_feed_icon(feed) { return getInitParam('icons_url') + "/" + feed.id + '.ico'; if (feed.id == -1) - return 'images/mark_set.png'; + return 'images/mark_set.svg'; if (feed.id == -2) - return 'images/pub_set.png'; + return 'images/pub_set.svg'; if (feed.id == -3) return 'images/fresh.png';