From 2feb97e9b9fbd7eef961bc8a28cd712db8c02b6e Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:43:52 +0100 Subject: [PATCH 1/5] scroll-behavior: smooth; (#6206) --- p/themes/base-theme/frss.css | 4 ++++ p/themes/base-theme/frss.rtl.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css index 82e049d64aa..32bd12b771a 100644 --- a/p/themes/base-theme/frss.css +++ b/p/themes/base-theme/frss.css @@ -53,6 +53,10 @@ url('../fonts/OpenSans.woff') format('woff'); } +html { + scroll-behavior: smooth; +} + html, body { margin: 0; padding: 0; diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css index 6c0b2bfb912..710beffef36 100644 --- a/p/themes/base-theme/frss.rtl.css +++ b/p/themes/base-theme/frss.rtl.css @@ -53,6 +53,10 @@ url('../fonts/OpenSans.woff') format('woff'); } +html { + scroll-behavior: smooth; +} + html, body { margin: 0; padding: 0; From d7bc70e3fb9785ee74e3d446d7a11858a083fe6a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 16 Mar 2024 11:02:50 +0100 Subject: [PATCH 2/5] Revert "scroll-behavior: smooth; (#6206)" This reverts commit 2feb97e9b9fbd7eef961bc8a28cd712db8c02b6e. https://github.com/FreshRSS/FreshRSS/pull/6206#issuecomment-2001934192 --- p/themes/base-theme/frss.css | 4 ---- p/themes/base-theme/frss.rtl.css | 4 ---- 2 files changed, 8 deletions(-) diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css index 32bd12b771a..82e049d64aa 100644 --- a/p/themes/base-theme/frss.css +++ b/p/themes/base-theme/frss.css @@ -53,10 +53,6 @@ url('../fonts/OpenSans.woff') format('woff'); } -html { - scroll-behavior: smooth; -} - html, body { margin: 0; padding: 0; diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css index 710beffef36..6c0b2bfb912 100644 --- a/p/themes/base-theme/frss.rtl.css +++ b/p/themes/base-theme/frss.rtl.css @@ -53,10 +53,6 @@ url('../fonts/OpenSans.woff') format('woff'); } -html { - scroll-behavior: smooth; -} - html, body { margin: 0; padding: 0; From 6bd6494ad48c4894befed44e9c3f753c123aca5d Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Sun, 17 Mar 2024 22:49:12 +0100 Subject: [PATCH 3/5] fixed HTML:
+ (#6202) * legend tags cleaned * formgroup -> fieldset tag * add bookmarklet class * Update logs.phtml * Update logs.phtml * fixed log table text alignment --- app/install.php | 7 +- app/views/configure/integration.phtml | 20 +- app/views/configure/system.phtml | 2 +- app/views/feed/add.phtml | 118 +-- app/views/helpers/category/update.phtml | 395 +++++----- app/views/helpers/configure/query.phtml | 214 +++--- app/views/helpers/feed/update.phtml | 936 ++++++++++++------------ app/views/index/logs.phtml | 86 ++- app/views/tag/update.phtml | 48 +- app/views/user/profile.phtml | 2 +- p/scripts/integration.js | 4 +- p/themes/Alternative-Dark/adark.css | 4 +- p/themes/Alternative-Dark/adark.rtl.css | 4 +- p/themes/Ansum/_tables.scss | 4 +- p/themes/Ansum/ansum.css | 4 +- p/themes/Ansum/ansum.rtl.css | 4 +- p/themes/Flat/flat.css | 4 +- p/themes/Flat/flat.rtl.css | 4 +- p/themes/Mapco/_tables.scss | 4 +- p/themes/Mapco/mapco.css | 4 +- p/themes/Mapco/mapco.rtl.css | 4 +- p/themes/Nord/nord.css | 4 +- p/themes/Nord/nord.rtl.css | 4 +- p/themes/Origine/origine.css | 4 +- p/themes/Origine/origine.rtl.css | 4 +- p/themes/Pafat/pafat.css | 4 +- p/themes/Pafat/pafat.rtl.css | 4 +- p/themes/Swage/swage.css | 4 +- p/themes/Swage/swage.rtl.css | 4 +- p/themes/base-theme/base.css | 4 +- p/themes/base-theme/base.rtl.css | 4 +- 31 files changed, 970 insertions(+), 942 deletions(-) diff --git a/app/install.php b/app/install.php index 5a9d6730c0d..7e4a4121f67 100644 --- a/app/install.php +++ b/app/install.php @@ -385,8 +385,8 @@ function printStep0(): void { +

-
@@ -522,8 +522,8 @@ function printStep2(): void { (empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']) ?>

+

-
@@ -622,9 +622,8 @@ function printStep3(): void {

+

- -
diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 973ee128fac..7d4cfd76546 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -13,7 +13,7 @@ update($share_options); ?> - +
name(true) ?> @@ -110,13 +110,11 @@
- +
- - - - +
+
@@ -132,7 +130,7 @@
- +
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 809b869a9b0..bd1c91fd1be 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -74,7 +74,7 @@
- +

diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml index da3bcf84454..ceec0d7b647 100644 --- a/app/views/feed/add.phtml +++ b/app/views/feed/add.phtml @@ -3,7 +3,7 @@ /** @var FreshRSS_View $this */ if ($this->feed !== null) { ?> -
+

load_ok) { ?> @@ -12,76 +12,82 @@ - - load_ok) { ?> -
- -
- +
+ + load_ok) { ?> +
+ +
+ +
-
- feed->description(); if ($desc != '') { ?> -
- -
- + feed->description(); if ($desc != '') { ?> +
+ +
+ +
-
- + -
- -
-
- - +
+ +
+
+ + +
-
- + -
- -
-
- - +
+ +
+
+ + +
+
+
-
-
-
-
- -
- +
+ +
+ +
-
+ - - feed->httpAuth(false); ?> -
- -
- -

+
+ + feed->httpAuth(false); ?> +
+ +
+ +

+
- -
-
- - +
+ +
+
+ + +
-
+
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index b3f92b449cc..7c0105b5fdc 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -17,224 +17,231 @@ - - -
- -
- category->id() === FreshRSS_CategoryDAO::DEFAULTCATEGORYID ? 'readonly="readonly"' : '' - ?> /> +
+ +
+ +
+ category->id() === FreshRSS_CategoryDAO::DEFAULTCATEGORYID ? 'readonly="readonly"' : '' + ?> /> +
-
-
- -
- -

+
+ +
+ +

+
-
-
-
- - +
+
+ + +
-
+ category->isDefault()): ?> - -
- -
-
- - - -
-

-

-
-
-
-
- - - -
-
+
+ +
+ +
+
+ + + +
+

+

+
+
+
+
+ + + +
+
+
- -
- -
- -

+
+ +
+ +
+ +

+
-
-
-
- - +
+
+ + +
-
+ - - category->attributeArray('archiving'); - /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ - if (empty($archiving)) { - $archiving = [ 'default' => true ]; - } else { - $archiving['default'] = false; - } - $volatile = [ - 'enable_keep_period' => false, - 'keep_period_count' => '3', - 'keep_period_unit' => 'P1M', - ]; - if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { - if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { - $volatile['enable_keep_period'] = true; - $volatile['keep_period_count'] = $matches['count']; - $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); +
+ + category->attributeArray('archiving'); + /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ + if (empty($archiving)) { + $archiving = [ 'default' => true ]; + } else { + $archiving['default'] = false; + } + $volatile = [ + 'enable_keep_period' => false, + 'keep_period_count' => '3', + 'keep_period_unit' => 'P1M', + ]; + if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { + if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { + $volatile['enable_keep_period'] = true; + $volatile['keep_period_count'] = $matches['count']; + $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + } + } + //Defaults + if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { + $archiving['keep_max'] = 0; } - } - //Defaults - if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { - $archiving['keep_max'] = 0; - } - if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { - $archiving['keep_min'] = 50; - } - if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { - $archiving['keep_favourites'] = true; - } - if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { - $archiving['keep_labels'] = true; - } - if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { - $archiving['keep_unreads'] = false; - } - ?> + if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { + $archiving['keep_min'] = 50; + } + if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { + $archiving['keep_favourites'] = true; + } + if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { + $archiving['keep_labels'] = true; + } + if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { + $archiving['keep_unreads'] = false; + } + ?> -

- -

+

+ +

-
- -
- +
+ +
+ +
-
-
diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml index 49ffbad8778..cce3985425a 100644 --- a/app/views/helpers/configure/query.phtml +++ b/app/views/helpers/configure/query.phtml @@ -22,120 +22,124 @@
- -
-
- - query->sharedUrlRss() !== ''): ?> - - -
-
- - query->sharedUrlOpml() !== ''): ?> -
    -
    • -
- +
+ +
+
+ + query->sharedUrlRss() !== ''): ?> + + +
+
+ + query->sharedUrlOpml() !== ''): ?> +
    +
    • +
+ +
+

+

-

-

-
-
-
- +
+
+ +
-
+ - -
- -
- -

+
+ +
+ +
+ +

+
-
-
- -
- - - - +
+ +
+ + + + +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- - +
+
+ + +
-
+
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 9d3aa59fa59..ba91030bd2e 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -34,381 +34,390 @@ ?>
- -
- -
- -
-
-
- -
- +
+ +
+ +
+ +
-
-
- -
-
- - +
+ +
+
-
-
- -
-
- - +
+ +
+
+ + +
-
-
-
- -
- +
+ +
+
+ + +
+ +
-
-
- -
- - +
+ +
+ +
-
- -
- -
- - +
+ +
+ + +
-
- feed->pubSubHubbubEnabled()) { ?>
+
-
- -
-
- - - feed->id()); - } else { - $url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from); - } - ?> - + feed->pubSubHubbubEnabled()) { ?> +
+
+ +
+
+ + +
+
+ + + feed->id()); + } else { + $url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from); + } + ?> + +
-
+ - - feed->httpAuth(false); ?> -
- -
- -

+
+ + feed->httpAuth(false); ?> +
+ +
+ +

+
-
-
- -
-
- - +
+ +
+
+ + +
-
-
-
- - +
+
+ + +
-
+ - -
- -
- +
+ +
+ +
+ +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- -

+
+ +
+ +

+
-
-
- -
- +
+ +
+ +
-
-
-
- - +
+
+ + +
-
- - + -
-
- - - - +
+ +
+
+ + + + +
-
- feed->attributeArray('archiving'); - /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ - if (empty($archiving)) { - $archiving = [ 'default' => true ]; - } else { - $archiving['default'] = false; - } - $volatile = [ - 'enable_keep_period' => false, - 'keep_period_count' => '3', - 'keep_period_unit' => 'P1M', - ]; - if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { - if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { - $volatile['enable_keep_period'] = true; - $volatile['keep_period_count'] = $matches['count']; - $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + feed->attributeArray('archiving'); + /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ + if (empty($archiving)) { + $archiving = [ 'default' => true ]; + } else { + $archiving['default'] = false; + } + $volatile = [ + 'enable_keep_period' => false, + 'keep_period_count' => '3', + 'keep_period_unit' => 'P1M', + ]; + if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { + if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { + $volatile['enable_keep_period'] = true; + $volatile['keep_period_count'] = $matches['count']; + $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + } + } + //Defaults + if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { + $archiving['keep_max'] = 0; + } + if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { + $archiving['keep_min'] = 50; + } + if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { + $archiving['keep_favourites'] = true; + } + if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { + $archiving['keep_labels'] = true; } - } - //Defaults - if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { - $archiving['keep_max'] = 0; - } - if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { - $archiving['keep_min'] = 50; - } - if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { - $archiving['keep_favourites'] = true; - } - if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { - $archiving['keep_labels'] = true; - } - if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { - $archiving['keep_unreads'] = false; - } - ?> - -

- -

- -
-
-
- + if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { + $archiving['keep_unreads'] = false; + } + ?> + +

+ +

+ +
+
+
+ +
-
-
diff --git a/app/views/tag/update.phtml b/app/views/tag/update.phtml index 69cc096f4a7..a9e5ca50c33 100644 --- a/app/views/tag/update.phtml +++ b/app/views/tag/update.phtml @@ -21,33 +21,37 @@
- -
- -
- +
+ +
+ +
+ +
-
-
-
- - +
+
+ + +
-
+ - -
- -
- -

+
+ +
+ +
+ +

+
-
+
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index 1ce964365bd..22b93510efe 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -75,10 +75,10 @@
+

api_enabled) { ?>
-
diff --git a/p/scripts/integration.js b/p/scripts/integration.js index 17760a04f7a..6a2face33db 100644 --- a/p/scripts/integration.js +++ b/p/scripts/integration.js @@ -15,7 +15,7 @@ const init_integration = function () { const shareTypes = event.target.closest('.group-controls').querySelector('select'); const shareType = shareTypes.options[shareTypes.selectedIndex]; const template = document.getElementById(shareType.getAttribute('data-form') + '-share'); - let newShare = template.content.cloneNode(true).querySelector('formgroup').outerHTML; + let newShare = template.content.cloneNode(true).querySelector('fieldset').outerHTML; newShare = newShare.replace(/##label##/g, shareType.text); newShare = newShare.replace(/##type##/g, shareType.value); @@ -23,7 +23,7 @@ const init_integration = function () { newShare = newShare.replace(/##key##/g, shares); newShare = newShare.replace(/##method##/g, shareType.getAttribute('data-method')); newShare = newShare.replace(/##field##/g, shareType.getAttribute('data-field')); - event.target.closest('formgroup').insertAdjacentHTML('beforebegin', newShare); + event.target.closest('fieldset').insertAdjacentHTML('beforebegin', newShare); shares++; }); diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css index 96b25139a56..2cbbb3168fc 100644 --- a/p/themes/Alternative-Dark/adark.css +++ b/p/themes/Alternative-Dark/adark.css @@ -129,8 +129,8 @@ th { background: var(--background-color-light); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css index 53a16cfdb54..98e22864627 100644 --- a/p/themes/Alternative-Dark/adark.rtl.css +++ b/p/themes/Alternative-Dark/adark.rtl.css @@ -129,8 +129,8 @@ th { background: var(--background-color-light); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Ansum/_tables.scss b/p/themes/Ansum/_tables.scss index 7376279e01b..ca568b1fea0 100644 --- a/p/themes/Ansum/_tables.scss +++ b/p/themes/Ansum/_tables.scss @@ -13,8 +13,8 @@ th { background: variables.$grey-lighter; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css index 61873b58abe..0681d239e50 100644 --- a/p/themes/Ansum/ansum.css +++ b/p/themes/Ansum/ansum.css @@ -195,8 +195,8 @@ th { background: #fcfaf8; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css index 6e6f2088fb3..2860d224946 100644 --- a/p/themes/Ansum/ansum.rtl.css +++ b/p/themes/Ansum/ansum.rtl.css @@ -195,8 +195,8 @@ th { background: #fcfaf8; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index a968a4412ab..96fb169bae1 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -83,8 +83,8 @@ th { background: #f6f6f6; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Flat/flat.rtl.css b/p/themes/Flat/flat.rtl.css index a25164d5112..da2e7aabe63 100644 --- a/p/themes/Flat/flat.rtl.css +++ b/p/themes/Flat/flat.rtl.css @@ -83,8 +83,8 @@ th { background: #f6f6f6; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Mapco/_tables.scss b/p/themes/Mapco/_tables.scss index 7376279e01b..ca568b1fea0 100644 --- a/p/themes/Mapco/_tables.scss +++ b/p/themes/Mapco/_tables.scss @@ -13,8 +13,8 @@ th { background: variables.$grey-lighter; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css index 13e7364fae1..79ac2bb16e7 100644 --- a/p/themes/Mapco/mapco.css +++ b/p/themes/Mapco/mapco.css @@ -194,8 +194,8 @@ th { background: #f9fafb; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css index 38c4bfb690a..1eefebc20c3 100644 --- a/p/themes/Mapco/mapco.rtl.css +++ b/p/themes/Mapco/mapco.rtl.css @@ -194,8 +194,8 @@ th { background: #f9fafb; } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Nord/nord.css b/p/themes/Nord/nord.css index 34857c01b3f..96f6772cd21 100644 --- a/p/themes/Nord/nord.css +++ b/p/themes/Nord/nord.css @@ -171,8 +171,8 @@ button.as-link[disabled] { } /*=== Tables */ -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; } diff --git a/p/themes/Nord/nord.rtl.css b/p/themes/Nord/nord.rtl.css index 2bf3e733a5f..c268e1b326b 100644 --- a/p/themes/Nord/nord.rtl.css +++ b/p/themes/Nord/nord.rtl.css @@ -171,8 +171,8 @@ button.as-link[disabled] { } /*=== Tables */ -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; } diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index e81d424ed5e..daa87e56cba 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -165,8 +165,8 @@ th { background-color: var(--background-color-light-shadowed); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css index 3db04c48037..cee08fa4881 100644 --- a/p/themes/Origine/origine.rtl.css +++ b/p/themes/Origine/origine.rtl.css @@ -165,8 +165,8 @@ th { background-color: var(--background-color-light-shadowed); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index f76e642877c..c2bae530106 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -153,8 +153,8 @@ th { background-color: var(--background-color-grey); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css index 09872919100..e62a07eab8f 100644 --- a/p/themes/Pafat/pafat.rtl.css +++ b/p/themes/Pafat/pafat.rtl.css @@ -153,8 +153,8 @@ th { background-color: var(--background-color-grey); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css index 67895310130..2d59d9eca7a 100644 --- a/p/themes/Swage/swage.css +++ b/p/themes/Swage/swage.css @@ -157,8 +157,8 @@ th { background-color: var(--color-background-light); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css index 1791c19b0f2..9e52fe99251 100644 --- a/p/themes/Swage/swage.rtl.css +++ b/p/themes/Swage/swage.rtl.css @@ -157,8 +157,8 @@ th { background-color: var(--color-background-light); } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 1bf5efe76db..54d6fba9e0d 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -63,8 +63,8 @@ th, td { th { } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } diff --git a/p/themes/base-theme/base.rtl.css b/p/themes/base-theme/base.rtl.css index 74609faa57f..7de8e4b4984 100644 --- a/p/themes/base-theme/base.rtl.css +++ b/p/themes/base-theme/base.rtl.css @@ -63,8 +63,8 @@ th, td { th { } -form td, -form th { +.config-articleicons td, +.config-articleicons th { font-weight: normal; text-align: center; } From b5445e1e56497f8bdc1de35a8325418c44b96d37 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 19 Mar 2024 13:42:12 +0100 Subject: [PATCH 4/5] Fix CLI install regressions (#6214) * Fix CLI install with prefix It was not possible to pass a blank prefix * Fix regression EXIT_CODE_ALREADY_EXISTS The dedicated exit code was not sent anymore when a user already exists --- Docker/README.md | 6 +++--- cli/create-user.php | 4 ++++ cli/do-install.php | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Docker/README.md b/Docker/README.md index 5afb02a591a..54f60a9910c 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -352,8 +352,8 @@ services: # So if changes are made (or in .env file), first delete the service and volumes. # ℹ️ All the --db-* parameters can be omitted if using built-in SQLite database. FRESHRSS_INSTALL: |- - --api_enabled - --base_url ${BASE_URL} + --api-enabled + --base-url ${BASE_URL} --db-base ${DB_BASE} --db-host ${DB_HOST} --db-password ${DB_PASSWORD} @@ -362,7 +362,7 @@ services: --default_user admin --language en FRESHRSS_USER: |- - --api_password ${ADMIN_API_PASSWORD} + --api-password ${ADMIN_API_PASSWORD} --email ${ADMIN_EMAIL} --language en --password ${ADMIN_PASSWORD} diff --git a/cli/create-user.php b/cli/create-user.php index 61bbc356368..1be604a422f 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -58,6 +58,10 @@ public function __construct() { $username = $cliOptions->user; +if (preg_grep("/^$username$/i", listUsers())) { + fail('FreshRSS warning: username already exists “' . $username . '”', EXIT_CODE_ALREADY_EXISTS); +} + echo 'FreshRSS creating user “', $username, "”…\n"; $values = [ diff --git a/cli/do-install.php b/cli/do-install.php index 77acc58ed08..483a443d950 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -132,7 +132,7 @@ public function __construct() { $config['pubsubhubbub_enabled'] = true; } -$config['db'] = array_merge($config['db'], array_filter($dbValues)); +$config['db'] = array_merge($config['db'], array_filter($dbValues, static fn($value) => $value !== null)); performRequirementCheck($config['db']['type']); From 1c0b8a7dcd933e23fca15bcce2de6bda16c84900 Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:25:58 +0100 Subject: [PATCH 5/5] Fix: dir=rtl (#6221) * Update layout.phtml * Update simple.phtml * Update contentSelectorPreview.phtml --- app/layout/layout.phtml | 5 +++-- app/layout/simple.phtml | 5 +++-- app/views/feed/contentSelectorPreview.phtml | 11 ++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index b6ed997248a..e581850bd68 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -3,8 +3,9 @@ /** @var FreshRSS_View $this */ FreshRSS::preLayout(); $class = ''; + $dir = ''; if (_t('gen.dir') === 'rtl') { - echo ' dir="rtl"'; + $dir = ' dir="rtl"'; $class = 'rtl '; } if (FreshRSS_Context::userConf()->darkMode !== 'no') { @@ -12,7 +13,7 @@ } ?> - + xml:lang="language ?>" class=""> diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index e460e283b86..a79d102afc3 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -3,8 +3,9 @@ /** @var FreshRSS_View $this */ FreshRSS::preLayout(); $class = ''; + $dir = ''; if (_t('gen.dir') === 'rtl') { - echo ' dir="rtl"'; + $dir = ' dir="rtl"'; $class = 'rtl '; } if (FreshRSS_Context::userConf()->darkMode !== 'no') { @@ -12,7 +13,7 @@ } ?> - + xml:lang="language ?>" class=""> diff --git a/app/views/feed/contentSelectorPreview.phtml b/app/views/feed/contentSelectorPreview.phtml index a93e8878323..c8c24419bec 100644 --- a/app/views/feed/contentSelectorPreview.phtml +++ b/app/views/feed/contentSelectorPreview.phtml @@ -2,9 +2,18 @@ declare(strict_types=1); /** @var FreshRSS_View $this */ FreshRSS::preLayout(); + $class = ''; + $dir = ''; + if (_t('gen.dir') === 'rtl') { + $dir = ' dir="rtl"'; + $class = 'rtl '; + } + if (FreshRSS_Context::userConf()->darkMode !== 'no') { + $class .= 'darkMode_' . FreshRSS_Context::userConf()->darkMode; + } ?> - + xml:lang="language ?>" class="">