servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove pub_{set,unset}.png usage in main code

This commit is contained in:
Andrew Dolgov 2018-12-05 14:18:03 +03:00
parent cbd7328cb4
commit a0778577ac
8 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/article.php
View File

@ -770,7 +770,6 @@ class Article extends Handler_Protected {
$rv['content'] .= " ";
$rv['content'] .= "<a target='_blank' rel='noopener noreferrer' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
$rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
$rv['content'] .= "</div>";
}

3
classes/feeds.php
View File

@ -330,7 +330,7 @@ class Feeds extends Handler_Protected {
if (feeds::feedHasIcon($feed_id)) {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
} else {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.png\" alt=\"\">";
$feed_icon_img = "<i class='icon-syndicate material-icons'>rss_feed</i>";
}
$entry_site_url = $line["site_url"];
@ -574,7 +574,6 @@ class Feeds extends Handler_Protected {
$tmp_content .= "&nbsp;";
$tmp_content .= "<a target='_blank' rel='noopener noreferrer' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
$tmp_content .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
$tmp_content .= "</div>";
}

2
css/cdm.less
View File

@ -17,7 +17,7 @@
white-space : nowrap;
}
.left {
.left, .right {
display : flex;
> * {

36
css/default.css
View File

@ -189,13 +189,16 @@ body.ttrss_main .hl > * {
body.ttrss_main .hl img {
vertical-align: middle;
}
body.ttrss_main .hl .left {
body.ttrss_main .hl .left,
body.ttrss_main .hl .right {
display: flex;
}
body.ttrss_main .hl .left > * {
body.ttrss_main .hl .left > *,
body.ttrss_main .hl .right > * {
align-self: center;
}
body.ttrss_main .hl .left i.material-icons {
body.ttrss_main .hl .left i.material-icons,
body.ttrss_main .hl .right i.material-icons {
margin-left: 2px;
font-size: 20px;
padding: 2px;
@ -742,11 +745,6 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
flex-grow: 2;
display: flex;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left i.icon-syndicate {
font-size: 19px;
color: #ff5718;
margin-right: 2px;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img {
vertical-align: middle;
margin-right: 8px;
@ -968,12 +966,17 @@ body.ttrss_main .dijitDialog h3:first-of-type,
body.ttrss_main .dijitDialog h4:first-of-type {
margin-top: 0px;
}
.cdm.marked .left i.marked-pic,
.hl.marked .left i.marked-pic {
body.ttrss_main i.icon-syndicate {
font-size: 19px;
color: #ff5718;
margin-right: 2px;
}
body.ttrss_main .cdm.marked .left i.marked-pic,
body.ttrss_main .hl.marked .left i.marked-pic {
color: #ffc069;
}
.cdm.published .left i.pub-pic,
.hl.published .left i.pub-pic {
body.ttrss_main .cdm.published .left i.pub-pic,
body.ttrss_main .hl.published .left i.pub-pic {
color: #ff5718;
}
::selection {
@ -1005,13 +1008,16 @@ body.ttrss_main .dijitDialog h4:first-of-type {
padding: 4px;
white-space: nowrap;
}
.cdm .header .left {
.cdm .header .left,
.cdm .header .right {
display: flex;
}
.cdm .header .left > * {
.cdm .header .left > *,
.cdm .header .right > * {
align-self: center;
}
.cdm .header .left i.material-icons {
.cdm .header .left i.material-icons,
.cdm .header .right i.material-icons {
margin-left: 2px;
font-size: 20px;
padding: 2px;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

34
css/tt-rss.less
View File

@ -218,8 +218,7 @@ body.ttrss_main {
img {
vertical-align : middle;
}
.left {
.left, .right {
display : flex;
> * {
@ -871,12 +870,6 @@ body.ttrss_main {
flex-grow: 2;
display : flex;
i.icon-syndicate {
font-size : 19px;
color : #ff5718;
margin-right : 2px;
}
img {
vertical-align : middle;
margin-right : 8px;
@ -1144,18 +1137,25 @@ body.ttrss_main .dijitDialog {
}
}
body.ttrss_main {
i.icon-syndicate {
font-size : 19px;
color : #ff5718;
margin-right : 2px;
}
.cdm.marked .left i.marked-pic,
.hl.marked .left i.marked-pic {
color : #ffc069;
}
.cdm.published .left i.pub-pic,
.hl.published .left i.pub-pic {
color : #ff5718;
}
.cdm.marked .left i.marked-pic,
.hl.marked .left i.marked-pic {
color : #ffc069;
}
.cdm.published .left i.pub-pic,
.hl.published .left i.pub-pic {
color : #ff5718;
}
::selection {
background : @color-accent;
color : white;

36
themes/night.css
View File

@ -189,13 +189,16 @@ body.ttrss_main .hl > * {
body.ttrss_main .hl img {
vertical-align: middle;
}
body.ttrss_main .hl .left {
body.ttrss_main .hl .left,
body.ttrss_main .hl .right {
display: flex;
}
body.ttrss_main .hl .left > * {
body.ttrss_main .hl .left > *,
body.ttrss_main .hl .right > * {
align-self: center;
}
body.ttrss_main .hl .left i.material-icons {
body.ttrss_main .hl .left i.material-icons,
body.ttrss_main .hl .right i.material-icons {
margin-left: 2px;
font-size: 20px;
padding: 2px;
@ -742,11 +745,6 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
flex-grow: 2;
display: flex;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left i.icon-syndicate {
font-size: 19px;
color: #ff5718;
margin-right: 2px;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img {
vertical-align: middle;
margin-right: 8px;
@ -968,12 +966,17 @@ body.ttrss_main .dijitDialog h3:first-of-type,
body.ttrss_main .dijitDialog h4:first-of-type {
margin-top: 0px;
}
.cdm.marked .left i.marked-pic,
.hl.marked .left i.marked-pic {
body.ttrss_main i.icon-syndicate {
font-size: 19px;
color: #ff5718;
margin-right: 2px;
}
body.ttrss_main .cdm.marked .left i.marked-pic,
body.ttrss_main .hl.marked .left i.marked-pic {
color: #ffc069;
}
.cdm.published .left i.pub-pic,
.hl.published .left i.pub-pic {
body.ttrss_main .cdm.published .left i.pub-pic,
body.ttrss_main .hl.published .left i.pub-pic {
color: #ff5718;
}
::selection {
@ -1005,13 +1008,16 @@ body.ttrss_main .dijitDialog h4:first-of-type {
padding: 4px;
white-space: nowrap;
}
.cdm .header .left {
.cdm .header .left,
.cdm .header .right {
display: flex;
}
.cdm .header .left > * {
.cdm .header .left > *,
.cdm .header .right > * {
align-self: center;
}
.cdm .header .left i.material-icons {
.cdm .header .left i.material-icons,
.cdm .header .right i.material-icons {
margin-left: 2px;
font-size: 20px;
padding: 2px;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long