From 2f402d598d7b40acb4380b10924d2bcbe864ab27 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 13 Mar 2021 11:35:15 +0300
Subject: [PATCH] only show right-side feed icon for vfeeds
---
js/Headlines.js | 4 ++--
themes/compact.css | 8 +++++++-
themes/compact_night.css | 8 +++++++-
themes/light.css | 8 +++++++-
themes/light/tt-rss.less | 13 +++++++++++--
themes/night.css | 8 +++++++-
themes/night_blue.css | 8 +++++++-
7 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/js/Headlines.js b/js/Headlines.js
index 90ded47bd..58348aca7 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -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-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)}
</span>
</div>
@@ -588,7 +588,7 @@ const Headlines = {
</div>
<div class="right">
<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>
`;
diff --git a/themes/compact.css b/themes/compact.css
index 6ede3a78e..ef4464ed3 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-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;
}
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 {
display: none;
}
+body.ttrss_main .icon-feed {
+ cursor: pointer;
+}
body.ttrss_main .panel {
border: 1px solid #ddd;
background: #f5f5f5;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 4e75a4935..0edf5ca1c 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-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;
}
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 {
display: none;
}
+body.ttrss_main .icon-feed {
+ cursor: pointer;
+}
body.ttrss_main .panel {
border: 1px solid #222;
background: #222;
diff --git a/themes/light.css b/themes/light.css
index 2efe1b9ef..821619446 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -663,7 +663,10 @@ body.ttrss_main #headlines-frame {
-webkit-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;
}
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 {
display: none;
}
+body.ttrss_main .icon-feed {
+ cursor: pointer;
+}
body.ttrss_main .panel {
border: 1px solid #ddd;
background: #f5f5f5;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 7b57bf157..c262ce9af 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -768,8 +768,13 @@ body.ttrss_main {
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
- &[data-is-vfeed="false"] .header .feed {
- display : none;
+ &[data-is-vfeed="false"] {
+ .header,
+ .hl {
+ .feed, .icon-feed {
+ display : none;
+ }
+ }
}
&[data-auto-catchup="true"] #headlines-spacer {
@@ -1171,6 +1176,10 @@ body.ttrss_main {
display : none;
}
+ .icon-feed {
+ cursor : pointer;
+ }
+
.panel {
border : 1px solid @border-default;
background : @color-panel-bg;
diff --git a/themes/night.css b/themes/night.css
index dd429eaca..39a50b9fa 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -664,7 +664,10 @@ body.ttrss_main #headlines-frame {
-webkit-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;
}
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 {
display: none;
}
+body.ttrss_main .icon-feed {
+ cursor: pointer;
+}
body.ttrss_main .panel {
border: 1px solid #222;
background: #222;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 4d523f982..031456b01 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -664,7 +664,10 @@ body.ttrss_main #headlines-frame {
-webkit-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;
}
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 {
display: none;
}
+body.ttrss_main .icon-feed {
+ cursor: pointer;
+}
body.ttrss_main .panel {
border: 1px solid #222;
background: #222;
--
GitLab