Merge remote-tracking branch 'upstream/edge' into edge

math-GH · Aug 28, 2024 · 10d5140 · 10d5140
2 parents b29fd80 + cb35591
commit 10d5140
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,20 @@
 See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases).
 
 
-## 2024-XX-XX FreshRSS 1.24.3-dev
+## 2024-0X-XX FreshRSS 1.24.3-dev
 
+* Bug fixing
+	* Fix mark-as-read from user query [#6738](https://github.com/FreshRSS/FreshRSS/pull/6738)
+	* Fix regression for shortcut to move between categories [#6741](https://github.com/FreshRSS/FreshRSS/pull/6741)
+	* Fix UI regression in Mapco/Ansum themes [#6740](https://github.com/FreshRSS/FreshRSS/pull/6740)
 * Security
 	* OpenID Connect better definition of session parameters [#6730](https://github.com/FreshRSS/FreshRSS/pull/6730)
+* Compatibility
+	* Last version supporting PHP 7.4
 * Misc.
 	* Use charset for JSON requests from the UI [#6710](https://github.com/FreshRSS/FreshRSS/pull/6710)
 	* Use `.html` extension for the local cache of full content pages instead of `.spc` [#6724](https://github.com/FreshRSS/FreshRSS/pull/6724)
+	* Update dev dependencies [#6739](https://github.com/FreshRSS/FreshRSS/pull/6739)
 
 
 ## 2024-08-23 FreshRSS 1.24.2
@@ -45,7 +52,6 @@ See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases).
 * CLI
 	* Add quiet option to `cli/db-backup.php` [#6593](https://github.com/FreshRSS/FreshRSS/pull/6593)
 * Compatibility
-	* Last version supporting PHP 7.4
 	* Initial support for PHP 8.4+ [#6615](https://github.com/FreshRSS/FreshRSS/pull/6615)
 		* With upstream contributions [php/php-src#14873](https://github.com/php/php-src/issues/14873), [PhpGt/CssXPath#227](https://github.com/PhpGt/CssXPath/pull/227)
 	* Fix SQLite on FreeBSD due to DQS [#6701](https://github.com/FreshRSS/FreshRSS/pull/6701), [#6702](https://github.com/FreshRSS/FreshRSS/pull/6702)

diff --git a/p/scripts/main.js b/p/scripts/main.js
@@ -605,7 +605,7 @@ function prev_category() {
 		do cat = cat.previousElementSibling;
 		while (cat && getComputedStyle(cat).display === 'none');
 		if (cat) {
-			delayedClick(cat.querySelector('a.title'));
+			delayedClick(cat.querySelector('a.tree-folder-title'));
 		}
 	} else {
 		last_category();
@@ -619,7 +619,7 @@ function next_category() {
 		do cat = cat.nextElementSibling;
 		while (cat && getComputedStyle(cat).display === 'none');
 		if (cat) {
-			delayedClick(cat.querySelector('a.title'));
+			delayedClick(cat.querySelector('a.tree-folder-title'));
 		}
 	} else {
 		first_category();
@@ -633,20 +633,20 @@ function next_unread_category() {
 		do cat = cat.nextElementSibling;
 		while (cat && cat.getAttribute('data-unread') <= 0);
 		if (cat) {
-			delayedClick(cat.querySelector('a.title'));
+			delayedClick(cat.querySelector('a.tree-folder-title'));
 		}
 	} else {
 		first_category();
 	}
 }
 
 function first_category() {
-	const a = document.querySelector('#aside_feed .category:not([data-unread="0"]) a.title');
+	const a = document.querySelector('#aside_feed .category:not([data-unread="0"]) a.tree-folder-title');
 	delayedClick(a);
 }
 
 function last_category() {
-	const links = document.querySelectorAll('#aside_feed .category:not([data-unread="0"]) a.title');
+	const links = document.querySelectorAll('#aside_feed .category:not([data-unread="0"]) a.tree-folder-title');
 	if (links && links.length > 0) {
 		delayedClick(links[links.length - 1]);
 	}

diff --git a/p/themes/Ansum/_sidebar.scss b/p/themes/Ansum/_sidebar.scss
@@ -18,14 +18,30 @@
 		box-shadow: inset -1px -11px 8px #0003;
 
 		.tree-folder-title {
-			padding: 1rem;
+			padding: 0.75rem 1rem;
 			background: variables.$sid-bg;
 			position: relative;
 			font-size: 0.85rem;
 			letter-spacing: 1px;
 			font-weight: 700;
 			text-transform: uppercase;
 
+			button.dropdown-toggle {
+				margin: -0.75rem 0.25rem -0.75rem -1rem;
+				padding: 0.75rem 0 0.75rem 1rem;
+
+				&:hover {
+					.icon {
+						filter: brightness(1.7) !important;
+						transition: 0.1s linear;
+					}
+				}
+			}
+
+			.icon {
+				margin-right: 0.5rem;
+			}
+
 			.title {
 				background: inherit;
 				color: variables.$sid-font-color;
@@ -47,8 +63,6 @@
 			background: variables.$sid-bg-alt;
 
 			.item {
-				padding: 0 1rem;
-				line-height: 2.5rem;
 				font-size: 1rem;
 				font-weight: 400;
 
@@ -77,6 +91,12 @@
 				a {
 					text-decoration: none;
 					color: variables.$sid-font-color;
+
+					&.dropdown-toggle {
+						.icon {
+							margin-right: 0.25rem;
+						}
+					}
 				}
 			}
 		}
@@ -121,12 +141,23 @@
 		text-align: center;
 		background: variables.$sid-bg;
 		border-right: 1px solid variables.$sid-sep;
+
+		.tree-folder-title:hover button.dropdown-toggle .icon {
+			filter: none;
+		}
 	}
 
 	&.aside_feed .tree {
 		margin: 10px 0 50px;
 	}
 
+	a:hover {
+		.icon {
+			filter: brightness(1.7);
+			transition: 0.1s linear;
+		}
+	}
+
 }
 
 
@@ -198,7 +229,7 @@
 }
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after {
-	margin: 1rem 0 0 0;
+	margin: 0.75rem 0 0 0;
 	background-color: variables.$sid-pills;
 }
 

diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css
@@ -464,14 +464,25 @@ th {
 	box-shadow: inset 1px -11px 8px rgba(0, 0, 0, 0.2);
 }
 .tree .tree-folder .tree-folder-title {
-	padding: 1rem;
+	padding: 0.75rem 1rem;
 	background: #fbf9f6;
 	position: relative;
 	font-size: 0.85rem;
 	letter-spacing: 1px;
 	font-weight: 700;
 	text-transform: uppercase;
 }
+.tree .tree-folder .tree-folder-title button.dropdown-toggle {
+	margin: -0.75rem -1rem -0.75rem 0.25rem;
+	padding: 0.75rem 1rem 0.75rem 0;
+}
+.tree .tree-folder .tree-folder-title button.dropdown-toggle:hover .icon {
+	filter: brightness(1.7) !important;
+	transition: 0.1s linear;
+}
+.tree .tree-folder .tree-folder-title .icon {
+	margin-left: 0.5rem;
+}
 .tree .tree-folder .tree-folder-title .title {
 	background: inherit;
 	color: #363330;
@@ -487,8 +498,6 @@ th {
 	background: #f7f2ea;
 }
 .tree .tree-folder .tree-folder-items .item {
-	padding: 0 1rem;
-	line-height: 2.5rem;
 	font-size: 1rem;
 	font-weight: 400;
 	transition: all 0.15s ease-in-out;
@@ -512,6 +521,9 @@ th {
 	text-decoration: none;
 	color: #363330;
 }
+.tree .tree-folder .tree-folder-items .item a.dropdown-toggle .icon {
+	margin-left: 0.25rem;
+}
 
 /*=== Buttons */
 .stick input, .stick .btn,
@@ -559,9 +571,16 @@ th {
 	background: #fbf9f6;
 	border-left: 1px solid #f0e7da;
 }
+.aside.aside_feed .tree-folder-title:hover button.dropdown-toggle .icon {
+	filter: none;
+}
 .aside.aside_feed .tree {
 	margin: 10px 0 50px;
 }
+.aside a:hover .icon {
+	filter: brightness(1.7);
+	transition: 0.1s linear;
+}
 
 /* Sidebar des pages de configuration */
 /*=== Navigation */
@@ -618,7 +637,7 @@ th {
 }
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after {
-	margin: 1rem 0 0 0;
+	margin: 0.75rem 0 0 0;
 	background-color: rgba(35, 35, 0, 0.15);
 }
 
@@ -1323,4 +1342,4 @@ body.register {
 a, button.as-link {
 	outline: none;
 	color: #ca7227;
-}
+}