mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-17 05:46:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1217 from Alkarex/read_all-bug

Browse Source 
Read-all bug fixed
This commit is contained in:
Alexandre Alapetite
2016-08-15 23:08:33 +02:00
committed by GitHub
parent a0230ad70b 1d6c71e216
commit aef1d2a774
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
p/scripts/main.js
View File

@@ -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')
);
}

2
p/themes/BlueLagoon/BlueLagoon.css
View File

@@ -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;

2
p/themes/Screwdriver/screwdriver.css
View File

@@ -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;