Merge pull request #1217 from Alkarex/read_all-bug

Read-all bug fixed
8 years ago · aef1d2a774
parent a0230ad70b 1d6c71e216
commit aef1d2a774
3 changed files with 4 additions and 4 deletions
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@ -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')
 			);
 		}

--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@ -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;
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@ -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;