From e8f066b4c2e53728b46edb592e4fc5937fcee96c Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Tue, 27 Aug 2024 23:56:17 +0200 Subject: [PATCH 1/3] fixed: Mapco/Ansum theme (#6740) * fixed * fix RTL --- p/themes/Ansum/_sidebar.scss | 39 ++++++++++++++++++++++++++++++++---- p/themes/Ansum/ansum.css | 31 +++++++++++++++++++++++----- p/themes/Ansum/ansum.rtl.css | 29 ++++++++++++++++++++++----- p/themes/Mapco/_sidebar.scss | 39 ++++++++++++++++++++++++++++++++---- p/themes/Mapco/mapco.css | 31 +++++++++++++++++++++++----- p/themes/Mapco/mapco.rtl.css | 29 ++++++++++++++++++++++----- 6 files changed, 170 insertions(+), 28 deletions(-) diff --git a/p/themes/Ansum/_sidebar.scss b/p/themes/Ansum/_sidebar.scss index 01c043566f9..2ba1d392fd2 100644 --- a/p/themes/Ansum/_sidebar.scss +++ b/p/themes/Ansum/_sidebar.scss @@ -18,7 +18,7 @@ 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; @@ -26,6 +26,22 @@ 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 index fcefd861e3d..3967e8c1196 100644 --- a/p/themes/Ansum/ansum.css +++ b/p/themes/Ansum/ansum.css @@ -464,7 +464,7 @@ 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; @@ -472,6 +472,17 @@ th { font-weight: 700; text-transform: uppercase; } +.tree .tree-folder .tree-folder-title button.dropdown-toggle { + margin: -0.75rem 0.25rem -0.75rem -1rem; + padding: 0.75rem 0 0.75rem 1rem; +} +.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-right: 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-right: 0.25rem; +} /*=== Buttons */ .stick input, .stick .btn, @@ -559,9 +571,16 @@ th { background: #fbf9f6; border-right: 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,6 @@ body.register { a, button.as-link { outline: none; color: #ca7227; -} \ No newline at end of file +} + +/*# sourceMappingURL=ansum.css.map */ diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css index fe535fbc503..88ed5248ac1 100644 --- a/p/themes/Ansum/ansum.rtl.css +++ b/p/themes/Ansum/ansum.rtl.css @@ -464,7 +464,7 @@ 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; @@ -472,6 +472,17 @@ th { 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; -} \ No newline at end of file +} diff --git a/p/themes/Mapco/_sidebar.scss b/p/themes/Mapco/_sidebar.scss index 03e79bd32de..0e211010455 100644 --- a/p/themes/Mapco/_sidebar.scss +++ b/p/themes/Mapco/_sidebar.scss @@ -18,7 +18,7 @@ border-bottom: 1px solid variables.$sid-sep; .tree-folder-title { - padding: 1rem; + padding: 0.75rem 1rem; background: variables.$sid-bg; position: relative; font-size: 0.85rem; @@ -26,6 +26,22 @@ 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(2) !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; + } + } } } } @@ -119,12 +139,23 @@ padding: 10px 0; text-align: center; background: variables.$sid-bg; + + .tree-folder-title:hover button.dropdown-toggle .icon { + filter: none; + } } &.aside_feed .tree { margin: 10px 0 50px; } + a:hover { + .icon { + filter: brightness(2); + transition: 0.1s linear; + } + } + } @@ -197,7 +228,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/Mapco/mapco.css b/p/themes/Mapco/mapco.css index 925e6ec8b7a..130258de89d 100644 --- a/p/themes/Mapco/mapco.css +++ b/p/themes/Mapco/mapco.css @@ -478,7 +478,7 @@ th { border-bottom: 1px solid #3f3f3f; } .tree .tree-folder .tree-folder-title { - padding: 1rem; + padding: 0.75rem 1rem; background: #303136; position: relative; font-size: 0.85rem; @@ -486,6 +486,17 @@ th { font-weight: 700; text-transform: uppercase; } +.tree .tree-folder .tree-folder-title button.dropdown-toggle { + margin: -0.75rem 0.25rem -0.75rem -1rem; + padding: 0.75rem 0 0.75rem 1rem; +} +.tree .tree-folder .tree-folder-title button.dropdown-toggle:hover .icon { + filter: brightness(2) !important; + transition: 0.1s linear; +} +.tree .tree-folder .tree-folder-title .icon { + margin-right: 0.5rem; +} .tree .tree-folder .tree-folder-title .title { background: inherit; color: #ffffff; @@ -501,8 +512,6 @@ th { background: #26272a; } .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; @@ -526,6 +535,9 @@ th { text-decoration: none; color: #ffffff; } +.tree .tree-folder .tree-folder-items .item a.dropdown-toggle .icon { + margin-right: 0.25rem; +} /*=== Buttons */ .stick input, .stick .btn, @@ -572,9 +584,16 @@ th { text-align: center; background: #303136; } +.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(2); + transition: 0.1s linear; +} /* Sidebar des pages de configuration */ /*=== Navigation */ @@ -632,7 +651,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(0, 0, 0, 0.25); } @@ -1343,4 +1362,6 @@ body.register { a, button.as-link { outline: none; color: #36c; -} \ No newline at end of file +} + +/*# sourceMappingURL=mapco.css.map */ diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css index c85d108d9d4..f1ebe923eff 100644 --- a/p/themes/Mapco/mapco.rtl.css +++ b/p/themes/Mapco/mapco.rtl.css @@ -478,7 +478,7 @@ th { border-bottom: 1px solid #3f3f3f; } .tree .tree-folder .tree-folder-title { - padding: 1rem; + padding: 0.75rem 1rem; background: #303136; position: relative; font-size: 0.85rem; @@ -486,6 +486,17 @@ th { 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(2) !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: #ffffff; @@ -501,8 +512,6 @@ th { background: #26272a; } .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; @@ -526,6 +535,9 @@ th { text-decoration: none; color: #ffffff; } +.tree .tree-folder .tree-folder-items .item a.dropdown-toggle .icon { + margin-left: 0.25rem; +} /*=== Buttons */ .stick input, .stick .btn, @@ -572,9 +584,16 @@ th { text-align: center; background: #303136; } +.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(2); + transition: 0.1s linear; +} /* Sidebar des pages de configuration */ /*=== Navigation */ @@ -632,7 +651,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(0, 0, 0, 0.25); } @@ -1343,4 +1362,4 @@ body.register { a, button.as-link { outline: none; color: #36c; -} \ No newline at end of file +} From f672b826d6b7e8416c1ff0025a06976423ef44de Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Wed, 28 Aug 2024 00:03:26 +0200 Subject: [PATCH 2/3] fixed: Shortcut keys for moving between categories (#6741) --- p/scripts/main.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/p/scripts/main.js b/p/scripts/main.js index 88586dc27dc..a907532b356 100644 --- 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,7 +633,7 @@ 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(); @@ -641,12 +641,12 @@ function next_unread_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]); } From cb355914e6ed49ba09e3b6a58bce3adc6171b745 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 28 Aug 2024 00:09:35 +0200 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 081eb9954dc..45f5b11992b 100644 --- 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)