aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-29 13:29:55 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-29 13:29:55 +0100
commit47bccc731f4abb7592c327a2e6a2783c825558b4 (patch)
treeda569787e3a16bb6f56da08d598df4bee70c9db7
parent234d1a9dca5a78980e5472d32fd8f5f458832ebd (diff)
parent1e4e0f5f1e317411198221dd3cd467c18d1d537a (diff)
Merge branch 'issue256' of github.com:aledeg/FreshRSS into dev
-rw-r--r--public/scripts/main.js1
-rw-r--r--public/themes/default/freshrss.css3
-rw-r--r--public/themes/flat-design/freshrss.css3
3 files changed, 7 insertions, 0 deletions
diff --git a/public/scripts/main.js b/public/scripts/main.js
index 89effc884..0c0e013e1 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -393,6 +393,7 @@ function init_stream_delegates(divStream) {
divStream.on('click', '.flux_header>.item.title, .flux_header>.item.date', function (e) { //flux_header_toggle
var old_active = $(".flux.current"),
new_active = $(this).parent().parent();
+ isCollapsed = true;
if (e.target.tagName.toUpperCase() === 'A') { //Leave real links alone
if (auto_mark_article) {
mark_read(new_active, true);
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index 2d166d369..1fdb7ebc1 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -288,6 +288,9 @@
color: #000;
outline: none;
}
+ .flux.current .item.title a {
+ text-decoration: underline;
+ }
.flux.not_read .item.title,
.flux.current .item.title {
font-weight: bold;
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index cfb79c46d..b249eb1a1 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -267,6 +267,9 @@ body {
color: #333;
outline: none;
}
+ .flux.current .item.title a {
+ text-decoration: underline;
+ }
.flux.current .item.title,
.flux.not_read .item.title {
font-weight: bold;