Skip to content

Commit

Permalink
Read-all bug fixed
Browse files Browse the repository at this point in the history
Introduced by the new forms of
FreshRSS#772
FreshRSS#1188
  • Loading branch information
Alkarex committed Aug 15, 2016
1 parent e627385 commit 8861994
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions p/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -993,12 +993,12 @@ function load_more_posts() {
box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day'));
$('.pagination').replaceWith($('.pagination', data));
if (context.display_order === 'ASC') {
$('#nav_menu_read_all > .read_all').attr(
$('#nav_menu_read_all .read_all').attr(
'formaction', $('#bigMarkAsRead').attr('formaction')
);
} else {
$('#bigMarkAsRead').attr(
'formaction', $('#nav_menu_read_all > .read_all').attr('formaction')
'formaction', $('#nav_menu_read_all .read_all').attr('formaction')
);
}

Expand Down
2 changes: 1 addition & 1 deletion p/themes/BlueLagoon/BlueLagoon.css
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ a.btn {
border: 1px solid #CCC;
box-shadow: 0px 1px #FFF;
}
#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle {
border-radius: 0 4px 4px 0;
border:none;
border-left: solid 1px #ccc;
Expand Down
2 changes: 1 addition & 1 deletion p/themes/Screwdriver/screwdriver.css
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ a.btn {
border: 1px solid #CCC;
box-shadow: 0px 1px #FFF;
}
#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{
#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle {
border-radius: 0 4px 4px 0;
border:none;
border-left: solid 1px #ccc;
Expand Down

0 comments on commit 8861994

Please sign in to comment.