From 090c647cd54e4cde051b12ece24d79af1d222fde Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 30 Jul 2016 12:19:02 +0200
Subject: Fix logs style scroll bug

https://github.com/FreshRSS/FreshRSS/issues/1178
There was a conflict on the ".logs" class name
---
 p/themes/BlueLagoon/BlueLagoon.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'p/themes/BlueLagoon')

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index e1b93dac9..d64ffd9a0 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -1054,7 +1054,7 @@ opacity: 1;
 
 /*=== LOGS */
 /*=========*/
-.logs {
+.loglist {
 	border: 1px solid #aaa;
 	border-radius: 5px;
 	overflow: hidden;
-- 
cgit v1.2.3


From 1d6c71e216898729cf2cc8330130b568ab198f2a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Aug 2016 23:07:47 +0200
Subject: Read-all bug fixed

Introduced by the new forms of
https://github.com/FreshRSS/FreshRSS/issues/772
https://github.com/FreshRSS/FreshRSS/pull/1188
---
 p/scripts/main.js                    | 4 ++--
 p/themes/BlueLagoon/BlueLagoon.css   | 2 +-
 p/themes/Screwdriver/screwdriver.css | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'p/themes/BlueLagoon')

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 6f1f40642..8980fe2f6 100644
--- 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')
 			);
 		}
 
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index d64ffd9a0..27bae5404 100644
--- 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;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index b7bbd923e..9dbe523a1 100644
--- 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;
-- 
cgit v1.2.3