From bf68205ae3b04ceb927cd0fb98e12f19b1daac37 Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Mon, 15 Apr 2024 23:14:34 +0200
Subject: Improved: Reading view: author (#6289)

* move the margin from themes to frss.css + delete font-size

* same source code as normal view for author information
---
 app/views/helpers/index/article.phtml   | 41 +++++++++++++++++----------------
 p/themes/Alternative-Dark/adark.css     |  2 --
 p/themes/Alternative-Dark/adark.rtl.css |  2 --
 p/themes/Ansum/_reader-view.scss        |  2 --
 p/themes/Ansum/ansum.css                |  2 --
 p/themes/Ansum/ansum.rtl.css            |  2 --
 p/themes/Flat/flat.css                  |  2 --
 p/themes/Flat/flat.rtl.css              |  2 --
 p/themes/Mapco/_reader-view.scss        |  2 --
 p/themes/Mapco/mapco.css                |  2 --
 p/themes/Mapco/mapco.rtl.css            |  2 --
 p/themes/Nord/nord.css                  |  5 ----
 p/themes/Nord/nord.rtl.css              |  5 ----
 p/themes/Origine/origine.css            |  2 --
 p/themes/Origine/origine.rtl.css        |  2 --
 p/themes/Pafat/pafat.css                |  2 --
 p/themes/Pafat/pafat.rtl.css            |  2 --
 p/themes/Swage/swage.css                |  6 ++---
 p/themes/Swage/swage.rtl.css            |  6 ++---
 p/themes/Swage/swage.scss               |  2 --
 p/themes/base-theme/base.css            |  5 ----
 p/themes/base-theme/base.rtl.css        |  5 ----
 22 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/app/views/helpers/index/article.phtml b/app/views/helpers/index/article.phtml
index caf06359d..56fd06b4f 100644
--- a/app/views/helpers/index/article.phtml
+++ b/app/views/helpers/index/article.phtml
@@ -40,27 +40,28 @@
 		<?php if (FreshRSS_Context::userConf()->show_author_date === 'h' || FreshRSS_Context::userConf()->show_author_date === 'b') { ?>
 			<div class="subtitle">
 				<?php if (FreshRSS_Context::userConf()->show_feed_name === 'a') { ?>
-					<div class="website"><a href="<?= $this->internal_rendering ? $feed->website() : _url('index', 'reader', 'get', 'f_' . $feed->id()) ?>" title="<?= _t('gen.action.filter') ?>">
-						<?php if (FreshRSS_Context::userConf()->show_favicons): ?>
-							<img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php
-						endif; ?><span><?= $feed->name() ?></span></a></div>
+					<div class="website">
+						<a href="<?= $this->internal_rendering ? $feed->website() : _url('index', 'reader', 'get', 'f_' . $feed->id()) ?>" title="<?= _t('gen.action.filter') ?>">
+							<?php if (FreshRSS_Context::userConf()->show_favicons): ?>
+								<img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php
+							endif; ?><span><?= $feed->name() ?></span>
+						</a>
+					</div>
+				<?php }
+
+				$authors = $entry->authors();
+				if (!empty($authors) && is_array($authors)) {
+					?>
+					<div class="author">
+						<?= _t('gen.short.by_author') ?>
+						<?php
+						foreach ($authors as $author) {
+							$href = Minz_Url::display(Minz_Request::modifiedCurrentRequest(['search' => 'author:"' . htmlspecialchars_decode($author, ENT_QUOTES) . '"']));
+							?>
+							<a href="<?= $href ?>" title="<?= _t('gen.action.filter') ?>"><?= $author ?></a>
+						<?php } ?>
+					</div>
 				<?php } ?>
-				<div class="author"><?php
-					$authors = $entry->authors();
-					if (is_array($authors)) {
-						if ($this->internal_rendering):
-							foreach ($authors as $author): ?>
-								<?= $author ?>
-							<?php endforeach;
-						else:
-							foreach ($authors as $author): ?>
-								<a href="<?= Minz_Url::display(Minz_Request::modifiedCurrentRequest(['search' => 'author:' . str_replace(' ', '+', htmlspecialchars_decode($author, ENT_QUOTES))])) ?>">
-									<?= $author ?>
-								</a>
-							<?php endforeach;
-						endif;
-					} ?>
-				</div>
 				<div class="date">
 					<time datetime="<?= $entry->machineReadableDate() ?>"><?= $entry->date() ?></time>
 				</div>
diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css
index 2cbbb3168..83680be28 100644
--- a/p/themes/Alternative-Dark/adark.css
+++ b/p/themes/Alternative-Dark/adark.css
@@ -951,9 +951,7 @@ kbd {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-dark);
-	font-size: 90%;
 }
 
 #stream-footer {
diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css
index 98e228646..8f064ca86 100644
--- a/p/themes/Alternative-Dark/adark.rtl.css
+++ b/p/themes/Alternative-Dark/adark.rtl.css
@@ -951,9 +951,7 @@ kbd {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-dark);
-	font-size: 90%;
 }
 
 #stream-footer {
diff --git a/p/themes/Ansum/_reader-view.scss b/p/themes/Ansum/_reader-view.scss
index 81046aa89..ca63f4f20 100644
--- a/p/themes/Ansum/_reader-view.scss
+++ b/p/themes/Ansum/_reader-view.scss
@@ -13,9 +13,7 @@
 			border: none;
 
 			.author {
-				margin: 0 0 10px;
 				color: variables.$grey-medium-dark;
-				font-size: 90%;
 			}
 		}
 	}
diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
index 0681d239e..f7bc0ab6c 100644
--- a/p/themes/Ansum/ansum.css
+++ b/p/themes/Ansum/ansum.css
@@ -1111,9 +1111,7 @@ main.prompt {
 	border: none;
 }
 #stream.reader .flux .content .author {
-	margin: 0 0 10px;
 	color: #ba9;
-	font-size: 90%;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css
index 2860d2249..919455f62 100644
--- a/p/themes/Ansum/ansum.rtl.css
+++ b/p/themes/Ansum/ansum.rtl.css
@@ -1111,9 +1111,7 @@ main.prompt {
 	border: none;
 }
 #stream.reader .flux .content .author {
-	margin: 0 0 10px;
 	color: #ba9;
-	font-size: 90%;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 96fb169ba..e88e6e55f 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -866,9 +866,7 @@ th {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: #999;
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Flat/flat.rtl.css b/p/themes/Flat/flat.rtl.css
index da2e7aabe..3e2d91d2b 100644
--- a/p/themes/Flat/flat.rtl.css
+++ b/p/themes/Flat/flat.rtl.css
@@ -866,9 +866,7 @@ th {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: #999;
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Mapco/_reader-view.scss b/p/themes/Mapco/_reader-view.scss
index 81046aa89..ca63f4f20 100644
--- a/p/themes/Mapco/_reader-view.scss
+++ b/p/themes/Mapco/_reader-view.scss
@@ -13,9 +13,7 @@
 			border: none;
 
 			.author {
-				margin: 0 0 10px;
 				color: variables.$grey-medium-dark;
-				font-size: 90%;
 			}
 		}
 	}
diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
index 79ac2bb16..76f807587 100644
--- a/p/themes/Mapco/mapco.css
+++ b/p/themes/Mapco/mapco.css
@@ -1126,9 +1126,7 @@ main.prompt {
 	border: none;
 }
 #stream.reader .flux .content .author {
-	margin: 0 0 10px;
 	color: #a6a7ae;
-	font-size: 90%;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css
index 1eefebc20..1c55b037a 100644
--- a/p/themes/Mapco/mapco.rtl.css
+++ b/p/themes/Mapco/mapco.rtl.css
@@ -1126,9 +1126,7 @@ main.prompt {
 	border: none;
 }
 #stream.reader .flux .content .author {
-	margin: 0 0 10px;
 	color: #a6a7ae;
-	font-size: 90%;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Nord/nord.css b/p/themes/Nord/nord.css
index 96f6772cd..92c29ce0e 100644
--- a/p/themes/Nord/nord.css
+++ b/p/themes/Nord/nord.css
@@ -1200,11 +1200,6 @@ optgroup::before {
 	border-radius: 12px;
 }
 
-#stream.reader .flux .author {
-	margin: 0 0 10px;
-	font-size: 90%;
-}
-
 /*=== GLOBAL VIEW */
 /*================*/
 .box.category .box-title .title {
diff --git a/p/themes/Nord/nord.rtl.css b/p/themes/Nord/nord.rtl.css
index c268e1b32..1525f28d3 100644
--- a/p/themes/Nord/nord.rtl.css
+++ b/p/themes/Nord/nord.rtl.css
@@ -1200,11 +1200,6 @@ optgroup::before {
 	border-radius: 12px;
 }
 
-#stream.reader .flux .author {
-	margin: 0 0 10px;
-	font-size: 90%;
-}
-
 /*=== GLOBAL VIEW */
 /*================*/
 .box.category .box-title .title {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index daa87e56c..6ff78f754 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -1007,9 +1007,7 @@ a:hover .icon {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-grey);
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css
index cee08fa48..79bfeda06 100644
--- a/p/themes/Origine/origine.rtl.css
+++ b/p/themes/Origine/origine.rtl.css
@@ -1007,9 +1007,7 @@ a:hover .icon {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-grey);
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index c2bae5301..ce4ec6742 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -982,9 +982,7 @@ a.signin {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-grey);
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css
index e62a07eab..cb140f021 100644
--- a/p/themes/Pafat/pafat.rtl.css
+++ b/p/themes/Pafat/pafat.rtl.css
@@ -982,9 +982,7 @@ a.signin {
 }
 
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--font-color-grey);
-	font-size: 90%;
 }
 
 /*=== GLOBAL VIEW */
diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css
index 2d59d9eca..092cbd1ca 100644
--- a/p/themes/Swage/swage.css
+++ b/p/themes/Swage/swage.css
@@ -157,8 +157,8 @@ th {
 	background-color: var(--color-background-light);
 }
 
-.config-articleicons td,
-.config-articleicons th {
+form td,
+form th {
 	font-weight: normal;
 	text-align: center;
 }
@@ -1154,9 +1154,7 @@ button.as-link {
 	border-color: var(--color-border-grey);
 }
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--color-text-light-darker);
-	font-size: 90%;
 }
 
 #nav_menu_actions ul.dropdown-menu {
diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css
index 9e52fe992..4a97b6375 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);
 }
 
-.config-articleicons td,
-.config-articleicons th {
+form td,
+form th {
 	font-weight: normal;
 	text-align: center;
 }
@@ -1154,9 +1154,7 @@ button.as-link {
 	border-color: var(--color-border-grey);
 }
 #stream.reader .flux .author {
-	margin: 0 0 10px;
 	color: var(--color-text-light-darker);
-	font-size: 90%;
 }
 
 #nav_menu_actions ul.dropdown-menu {
diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss
index 26e04cf2e..33f3db81c 100644
--- a/p/themes/Swage/swage.scss
+++ b/p/themes/Swage/swage.scss
@@ -1474,9 +1474,7 @@ button.as-link {
 	}
 
 	.author {
-		margin: 0 0 10px;
 		color: var(--color-text-light-darker);
-		font-size: 90%;
 	}
 }
 
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 54d6fba9e..99a98b50e 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -652,11 +652,6 @@ th {
 	border-color: #ddd;
 }
 
-#stream.reader .flux .author {
-	margin: 0 0 10px;
-	font-size: 90%;
-}
-
 /*=== GLOBAL VIEW */
 /*================*/
 .box.category .box-title .title {
diff --git a/p/themes/base-theme/base.rtl.css b/p/themes/base-theme/base.rtl.css
index 7de8e4b49..892cefe33 100644
--- a/p/themes/base-theme/base.rtl.css
+++ b/p/themes/base-theme/base.rtl.css
@@ -652,11 +652,6 @@ th {
 	border-color: #ddd;
 }
 
-#stream.reader .flux .author {
-	margin: 0 0 10px;
-	font-size: 90%;
-}
-
 /*=== GLOBAL VIEW */
 /*================*/
 .box.category .box-title .title {
-- 
cgit v1.2.3