aboutsummaryrefslogtreecommitdiff
path: root/p/themes/Mapco
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2019-11-05 16:42:29 +0100
committerGravatar GitHub <noreply@github.com> 2019-11-05 16:42:29 +0100
commitbba0b0565559fbecf5df170b472cadc58627027a (patch)
tree28e3401bc56c5240cc697d3180942c6d6b4377f4 /p/themes/Mapco
parent7a4f42df4b5e33fb62e50c2ea705ec7a126966ae (diff)
Fix favorite display for "current" articles (#2634)
Favorite articles have, in most of the themes, a gold background to distinguish them from the other articles. However, it can be distracting to have such a background when reading the articles, so we should turn them back to the "default" background when articles are opened (class `.current`). Bug introduced in e9ce27d8d991d7806ca2c2af7e5282279e378885 Related PRs: - https://github.com/FreshRSS/FreshRSS/pull/2477 - https://github.com/FreshRSS/FreshRSS/pull/2611 - https://github.com/FreshRSS/FreshRSS/pull/2612 Closes https://github.com/FreshRSS/FreshRSS/issues/2618
Diffstat (limited to 'p/themes/Mapco')
-rw-r--r--p/themes/Mapco/_list-view.scss21
-rw-r--r--p/themes/Mapco/mapco.css21
2 files changed, 20 insertions, 22 deletions
diff --git a/p/themes/Mapco/_list-view.scss b/p/themes/Mapco/_list-view.scss
index ab3001ee4..760aea96c 100644
--- a/p/themes/Mapco/_list-view.scss
+++ b/p/themes/Mapco/_list-view.scss
@@ -20,19 +20,15 @@
border-left-color: $main-first;
}
- &.not_read {
+ &.not_read:not(.current) {
background: $unread-bg; //--------------------
- // border-left-color: #FF5300;
- &:hover {
- background: $unread-bg-light; //--------------------
- }
-
- &:not(.current):hover .item.title {
- background: $unread-bg-light;
-
+ &:hover .item.title {
+ background: $unread-bg;
}
+ }
+ &.not_read {
.item.title {
a {
color: $unread-font-color; //--------------------
@@ -52,12 +48,15 @@
}
&.favorite {
- background: $fav-light;
border-left-color: $fav-bg;
@include transition(all, 0.15s, ease-in-out);
+ }
- &:not(.current):hover .item.title {
+ &.favorite:not(.current) {
+ background: $fav-light;
+
+ &:hover .item.title {
background: $fav-light;
}
}
diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
index b144dca58..bbbad8560 100644
--- a/p/themes/Mapco/mapco.css
+++ b/p/themes/Mapco/mapco.css
@@ -970,26 +970,25 @@ form th {
.flux.current {
background: #f9fafb;
border-left-color: #36c; }
- .flux.not_read {
+ .flux.not_read:not(.current) {
background: #f2f6f8; }
- .flux.not_read:hover {
- background: #fdfdfe; }
.flux.not_read:not(.current):hover .item.title {
- background: #fdfdfe; }
- .flux.not_read .item.title a {
- color: #36c; }
- .flux.not_read .item.website a {
- color: #36c; }
- .flux.not_read .item.date {
- color: #36c99; }
+ background: #f2f6f8; }
+ .flux.not_read .item.title a {
+ color: #36c; }
+ .flux.not_read .item.website a {
+ color: #36c; }
+ .flux.not_read .item.date {
+ color: #36c99; }
.flux.favorite {
- background: #fff6da;
border-left-color: #ffc300;
-webkit-transition: all 0.15s ease-in-out;
-moz-transition: all 0.15s ease-in-out;
-o-transition: all 0.15s ease-in-out;
-ms-transition: all 0.15s ease-in-out;
transition: all 0.15s ease-in-out; }
+ .flux.favorite:not(.current) {
+ background: #fff6da; }
.flux.favorite:not(.current):hover .item.title {
background: #fff6da; }
.flux .website a {