Skip to content

Commit

Permalink
Fix favorite display for "current" articles (FreshRSS#2634)
Browse files Browse the repository at this point in the history
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 e9ce27d

Related PRs:

- FreshRSS#2477
- FreshRSS#2611
- FreshRSS#2612

Closes FreshRSS#2618
  • Loading branch information
marienfressinaud authored Nov 5, 2019
1 parent b008a82 commit 7c605d1
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 64 deletions.
22 changes: 10 additions & 12 deletions p/themes/Ansum/_list-view.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,19 @@
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; //--------------------
}

}

.item.website {
Expand All @@ -52,12 +47,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;
}
}
Expand Down
21 changes: 10 additions & 11 deletions p/themes/Ansum/ansum.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion p/themes/Flat/flat.css
Original file line number Diff line number Diff line change
Expand Up @@ -803,10 +803,13 @@ a.btn {
}

.flux.favorite {
background: #fff6da;
border-left-color: #ffc300;
}

.flux.favorite:not(.current) {
background: #fff6da;
}

.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
Expand Down
21 changes: 10 additions & 11 deletions p/themes/Mapco/_list-view.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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; //--------------------
Expand All @@ -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;
}
}
Expand Down
21 changes: 10 additions & 11 deletions p/themes/Mapco/mapco.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion p/themes/Origine-compact/origine-compact.css
Original file line number Diff line number Diff line change
Expand Up @@ -837,10 +837,13 @@ a.btn,
}

.flux.favorite {
background: #fff6da;
border-left: 2px solid #ffc300;
}

.flux.favorite:not(.current) {
background: #fff6da;
}

.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
Expand Down
5 changes: 4 additions & 1 deletion p/themes/Origine/origine.css
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,13 @@ a.btn {
}

.flux.favorite {
background: #fff6da;
border-left: 2px solid #ffc300;
}

.flux.favorite:not(.current) {
background: #fff6da;
}

.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
Expand Down
5 changes: 4 additions & 1 deletion p/themes/Pafat/pafat.css
Original file line number Diff line number Diff line change
Expand Up @@ -798,10 +798,13 @@ a.btn {
}

.flux.favorite {
background: #fff6da;
border-left: 2px solid #428bca;
}

.flux.favorite:not(.current) {
background: #fff6da;
}

.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
Expand Down
10 changes: 5 additions & 5 deletions p/themes/Swage/swage.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions p/themes/Swage/swage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -928,21 +928,19 @@ form {
}
}

&.not_read {
&:not(.current) {
background: $color_unread;
}
&.favorite:not(.current) {
background: $color_stared;

&:not(.current):hover .item.title {
background: $color_unread;
&:hover .item.title {
background: $color_stared;
}
}

&.favorite, {
background: $color_stared;
&.not_read:not(.current) {
background: $color_unread;

&:not(.current):hover .item.title {
background: $color_stared;
&:hover .item.title {
background: $color_unread;
}
}

Expand Down

0 comments on commit 7c605d1

Please sign in to comment.