valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only show right-side feed icon for vfeeds

This commit is contained in:
Andrew Dolgov 2021-03-13 11:35:15 +03:00
parent 38ab3ef11c
commit 2f402d598d
7 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/Headlines.js
View File

@ -524,7 +524,7 @@ const Headlines = {
<i class="material-icons icon-grid-span" title="${__("Span all columns")}" onclick="Article.cdmToggleGridSpan(${hl.id})">fullscreen</i> <i class="material-icons icon-grid-span" title="${__("Span all columns")}" onclick="Article.cdmToggleGridSpan(${hl.id})">fullscreen</i>
<i class="material-icons icon-score" title="${hl.score}" onclick="Article.setScore(${hl.id}, this)">${Article.getScorePic(hl.score)}</i> <i class="material-icons icon-score" title="${hl.score}" onclick="Article.setScore(${hl.id}, this)">${Article.getScorePic(hl.score)}</i>
<span style="cursor : pointer" title="${App.escapeHtml(hl.feed_title)}" onclick="Feeds.open({feed:${hl.feed_id}})"> <span class="icon-feed" title="${App.escapeHtml(hl.feed_title)}" onclick="Feeds.open({feed:${hl.feed_id}})">
${Feeds.renderIcon(hl.feed_id, hl.has_icon)} ${Feeds.renderIcon(hl.feed_id, hl.has_icon)}
</span> </span>
</div> </div>
@ -588,7 +588,7 @@ const Headlines = {
</div> </div>
<div class="right"> <div class="right">
<i class="material-icons icon-score" title="${hl.score}" onclick="Article.setScore(${hl.id}, this)">${Article.getScorePic(hl.score)}</i> <i class="material-icons icon-score" title="${hl.score}" onclick="Article.setScore(${hl.id}, this)">${Article.getScorePic(hl.score)}</i>
<span onclick="Feeds.open({feed:${hl.feed_id}})" style="cursor : pointer" title="${App.escapeHtml(hl.feed_title)}">${Feeds.renderIcon(hl.feed_id, hl.has_icon)}</span> <span onclick="Feeds.open({feed:${hl.feed_id}})" class="icon-feed" title="${App.escapeHtml(hl.feed_title)}">${Feeds.renderIcon(hl.feed_id, hl.has_icon)}</span>
</div> </div>
</div> </div>
`; `;

8
themes/compact.css
View File

@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
} }
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed { body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .icon-feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .icon-feed {
display: none; display: none;
} }
body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer {
@ -988,6 +991,9 @@ body.ttrss_main i.icon-grid-span {
body.ttrss_main .icon-grid-span { body.ttrss_main .icon-grid-span {
display: none; display: none;
} }
body.ttrss_main .icon-feed {
cursor: pointer;
}
body.ttrss_main .panel { body.ttrss_main .panel {
border: 1px solid #ddd; border: 1px solid #ddd;
background: #f5f5f5; background: #f5f5f5;

8
themes/compact_night.css
View File

@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
} }
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed { body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .icon-feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .icon-feed {
display: none; display: none;
} }
body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer {
@ -988,6 +991,9 @@ body.ttrss_main i.icon-grid-span {
body.ttrss_main .icon-grid-span { body.ttrss_main .icon-grid-span {
display: none; display: none;
} }
body.ttrss_main .icon-feed {
cursor: pointer;
}
body.ttrss_main .panel { body.ttrss_main .panel {
border: 1px solid #222; border: 1px solid #222;
background: #222; background: #222;

8
themes/light.css
View File

@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
} }
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed { body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .icon-feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .icon-feed {
display: none; display: none;
} }
body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer {
@ -988,6 +991,9 @@ body.ttrss_main i.icon-grid-span {
body.ttrss_main .icon-grid-span { body.ttrss_main .icon-grid-span {
display: none; display: none;
} }
body.ttrss_main .icon-feed {
cursor: pointer;
}
body.ttrss_main .panel { body.ttrss_main .panel {
border: 1px solid #ddd; border: 1px solid #ddd;
background: #f5f5f5; background: #f5f5f5;

13
themes/light/tt-rss.less
View File

@ -768,8 +768,13 @@ body.ttrss_main {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
&[data-is-vfeed="false"] .header .feed { &[data-is-vfeed="false"] {
display : none; .header,
.hl {
.feed, .icon-feed {
display : none;
}
}
} }
&[data-auto-catchup="true"] #headlines-spacer { &[data-auto-catchup="true"] #headlines-spacer {
@ -1171,6 +1176,10 @@ body.ttrss_main {
display : none; display : none;
} }
.icon-feed {
cursor : pointer;
}
.panel { .panel {
border : 1px solid @border-default; border : 1px solid @border-default;
background : @color-panel-bg; background : @color-panel-bg;

8
themes/night.css
View File

@ -664,7 +664,10 @@ body.ttrss_main #headlines-frame {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
} }
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed { body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .icon-feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .icon-feed {
display: none; display: none;
} }
body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer {
@ -989,6 +992,9 @@ body.ttrss_main i.icon-grid-span {
body.ttrss_main .icon-grid-span { body.ttrss_main .icon-grid-span {
display: none; display: none;
} }
body.ttrss_main .icon-feed {
cursor: pointer;
}
body.ttrss_main .panel { body.ttrss_main .panel {
border: 1px solid #222; border: 1px solid #222;
background: #222; background: #222;

8
themes/night_blue.css
View File

@ -664,7 +664,10 @@ body.ttrss_main #headlines-frame {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
} }
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed { body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .header .icon-feed,
body.ttrss_main #headlines-frame[data-is-vfeed="false"] .hl .icon-feed {
display: none; display: none;
} }
body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer {
@ -989,6 +992,9 @@ body.ttrss_main i.icon-grid-span {
body.ttrss_main .icon-grid-span { body.ttrss_main .icon-grid-span {
display: none; display: none;
} }
body.ttrss_main .icon-feed {
cursor: pointer;
}
body.ttrss_main .panel { body.ttrss_main .panel {
border: 1px solid #222; border: 1px solid #222;
background: #222; background: #222;