remove some bitmaps and rework stuff using it to use iconfont instead

master
Andrew Dolgov 6 years ago
parent 7609ccb16d
commit 0b8cbc9156

@ -28,8 +28,6 @@ class Feeds extends Handler_Protected {
$rss_link = htmlspecialchars(get_self_url_prefix() .
"/public.php?op=rss&id=$feed_id$cat_q$search_q");
$error_class = $error ? "error" : "";
$reply .= "<span class='left'>";
$reply .= "<a href=\"#\"
@ -37,25 +35,20 @@ class Feeds extends Handler_Protected {
onclick=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
<i class='icon-syndicate material-icons'>rss_feed</i></a>";
$reply .= "<span id='feed_title' class='$error_class'>";
$reply .= "<span id='feed_title'>";
if ($feed_site_url) {
$last_updated = T_sprintf("Last updated: %s",
$feed_last_updated);
$last_updated = T_sprintf("Last updated: %s", $feed_last_updated);
$target = "target=\"_blank\"";
$reply .= "<a title=\"$last_updated\" $target href=\"$feed_site_url\">".
$reply .= "<a title=\"$last_updated\" target='_blank' href=\"$feed_site_url\">".
truncate_string(strip_tags($feed_title), 30)."</a>";
if ($error) {
$error = htmlspecialchars($error);
$reply .= "&nbsp;<img title=\"$error\" src='images/error.png' alt='error' class=\"noborder\">";
}
} else {
$reply .= strip_tags($feed_title);
}
if ($error)
$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
$reply .= "</span></span>";
$reply .= "<span class=\"right\">";
@ -1503,7 +1496,7 @@ class Feeds extends Handler_Protected {
break;
default:
if ($id < LABEL_BASE_INDEX) {
return "images/label.png";
return "label";
} else {
$icon = self::getIconFile($id);

@ -542,9 +542,8 @@ class Pref_Feeds extends Handler_Protected {
$last_error = $row["last_error"];
if ($last_error) {
print "&nbsp;<img src=\"images/error.png\" alt=\"(error)\"
style=\"vertical-align : middle\"
title=\"".htmlspecialchars($last_error)."\">";
print "&nbsp;<i class=\"material-icons\"
title=\"".htmlspecialchars($last_error)."\">error</i>";
}

@ -752,7 +752,8 @@ body.ttrss_main #toolbar-frame #toolbar .dijitDropDownButton .dijitButtonNode,
body.ttrss_main #toolbar-frame #toolbar .dijitComboButton .dijitButtonNode {
border: 0px;
}
body.ttrss_main #toolbar-frame #toolbar .net-alert i {
body.ttrss_main #toolbar-frame #toolbar .net-alert i,
body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
color: red;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
@ -777,6 +778,10 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right > * {
align-self: center;
}
body.ttrss_main #toolbar-frame #toolbar #updates-available {
color: #69c671;
padding-right: 4px;
}
body.ttrss_main #toolbar-frame #toolbar #selected_prompt {
font-style: italic;
text-align: right;

File diff suppressed because one or more lines are too long

@ -887,7 +887,7 @@ body.ttrss_main {
border : 0px;
}
.net-alert i {
.net-alert i, .left i.icon-error {
color : red;
}
@ -919,6 +919,11 @@ body.ttrss_main {
}
}
#updates-available {
color : @color-enabled;
padding-right : 4px;
}
#selected_prompt {
font-style : italic;
text-align : right;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 691 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 793 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 741 B

@ -1107,9 +1107,6 @@
$params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
$params["icon_alert"] = base64_img("images/alert.png");
$params["icon_information"] = base64_img("images/information.png");
$params["icon_cross"] = base64_img("images/cross.png");
$params["icon_indicator_white"] = base64_img("images/indicator_white.gif");
$params["labels"] = Labels::get_all_labels($_SESSION["uid"]);

@ -252,9 +252,9 @@
</div>
</div>
<button id="updatesIcon" dojoType="dijit.form.Button" style="display : none">
<img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/>
</button>
<i id="updates-available" class="material-icons icon-new-version"
style="display : none" title="<?php echo __('Updates are available from Git.') ?>">new_releases</i>
</div>
</div> <!-- toolbar -->
</div> <!-- toolbar pane -->

@ -264,12 +264,10 @@ define(["dojo/_base/declare"], function (declare) {
}
if (k == "update_result") {
const updatesIcon = dijit.byId("updatesIcon").domNode;
if (v) {
Element.show(updatesIcon);
Element.show("updates-available");
} else {
Element.hide(updatesIcon);
Element.hide("updates-available");
}
}

@ -199,9 +199,8 @@ const Notify = {
else
msgfmt = "<i class='material-icons icon-notify'>%s</i>".replace("%s", icon) + msgfmt;
msgfmt += ("<i class='material-icons icon-close' title=\"" +
__("Click to close") + "\" onclick=\"Notify.close()\">close</i>")
.replace("%s", App.getInitParam("icon_cross"));
msgfmt += "<i class='material-icons icon-close' title=\"" +
__("Click to close") + "\" onclick=\"Notify.close()\">close</i>";
notify.innerHTML = msgfmt;
notify.addClassName("visible");

Loading…
Cancel
Save