diff options
| author | 2022-10-23 20:56:25 +0200 | |
|---|---|---|
| committer | 2022-10-23 20:56:25 +0200 | |
| commit | c191e0315e96cd9c8b0e0bec28f0931c874bbf79 (patch) | |
| tree | 68e9aa043ccd161032e17da82079fa820c3e9b3d | |
| parent | 5e716695896cdbe62e8a572358d079d480f88d7f (diff) | |
Fix 4712 (#4750)
* fix
* fix
* fix nord theme (a bit)
* fix
| -rw-r--r-- | app/views/helpers/index/normal/entry_header.phtml | 18 | ||||
| -rw-r--r-- | p/themes/Nord/nord.css | 1 | ||||
| -rw-r--r-- | p/themes/Nord/nord.rtl.css | 1 | ||||
| -rw-r--r-- | p/themes/Pafat/pafat.css | 8 | ||||
| -rw-r--r-- | p/themes/Pafat/pafat.rtl.css | 8 | ||||
| -rw-r--r-- | p/themes/base-theme/frss.css | 6 | ||||
| -rw-r--r-- | p/themes/base-theme/frss.rtl.css | 6 |
7 files changed, 31 insertions, 17 deletions
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml index 38d81f5c9..248ad4804 100644 --- a/app/views/helpers/index/normal/entry_header.phtml +++ b/app/views/helpers/index/normal/entry_header.phtml @@ -16,7 +16,7 @@ if ($this->entry->isRead()) { $arUrl['params']['is_read'] = 0; } - ?><a class="read" href="<?= Minz_Url::display($arUrl) ?>" title="<?= _t('conf.shortcut.mark_read') ?>"><?php + ?><a class="item-element read" href="<?= Minz_Url::display($arUrl) ?>" title="<?= _t('conf.shortcut.mark_read') ?>"><?php echo _i($this->entry->isRead() ? 'read' : 'unread'); ?></a><?php ?></li><?php } @@ -26,13 +26,13 @@ if ($this->entry->isFavorite()) { $arUrl['params']['is_favorite'] = 0; } - ?><a class="bookmark" href="<?= Minz_Url::display($arUrl) ?>" title="<?= _t('conf.shortcut.mark_favorite') ?>"><?php + ?><a class="item-element bookmark" href="<?= Minz_Url::display($arUrl) ?>" title="<?= _t('conf.shortcut.mark_favorite') ?>"><?php echo _i($this->entry->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php ?></li><?php } } ?><li class="item website"> - <a href="<?= _url('index', 'index', 'get', 'f_' . $this->feed->id()) ?>" title="<?= _t('gen.action.filter') ?>: <?= $this->feed->name() ?>"> + <a href="<?= _url('index', 'index', 'get', 'f_' . $this->feed->id()) ?>" class="item-element" title="<?= _t('gen.action.filter') ?>: <?= $this->feed->name() ?>"> <?php if (FreshRSS_Context::$user_conf->show_favicons): ?><img class="favicon" src="<?= $this->feed->favicon() ?>" alt="✇" loading="lazy" /><?php endif; ?><span><?= $this->feed->name() ?></span> </a> </li> @@ -42,15 +42,15 @@ ?><li class="item thumbnail <?= $topline_thumbnail ?> <?= $topline_summary ? '' : 'small' ?>"><?php $thumbnail = $this->entry->thumbnail(); if ($thumbnail != null): - ?><img src="<?= htmlspecialchars($thumbnail['url'], ENT_COMPAT, 'UTF-8') ?>"<?= $lazyload ? ' loading="lazy"' : '' ?><?= + ?><img src="<?= htmlspecialchars($thumbnail['url'], ENT_COMPAT, 'UTF-8') ?>" class="item-element "<?= $lazyload ? ' loading="lazy"' : '' ?><?= empty($thumbnail['alt']) ? '' : ' alt="' . htmlspecialchars(strip_tags($thumbnail['alt']), ENT_COMPAT, 'UTF-8') . '"' ?> /><?php endif; ?></li><?php endif; ?> - <li class="item title<?= (($topline_thumbnail !== 'none') || $topline_summary) ? ' multiline' : '' ?>" dir="auto"><a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>"><?= $this->entry->title() ?><?php + <li class="item title<?= (($topline_thumbnail !== 'none') || $topline_summary) ? ' multiline' : '' ?>" dir="auto"><a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>" class="item-element"><?= $this->entry->title() ?><?php if ($topline_display_authors): - ?><span class="author"><?php + ?><span class="item-element author"><?php $authors = $this->entry->authors(); if (is_array($authors)) { $first = true; @@ -62,10 +62,10 @@ ?></span><?php endif; if ($topline_summary): - ?><div class="summary"><?= trim(mb_substr(strip_tags($this->entry->content()), 0, 500, 'UTF-8')) ?></div><?php + ?><div class="item-element summary"><?= trim(mb_substr(strip_tags($this->entry->content()), 0, 500, 'UTF-8')) ?></div><?php endif; ?></a></li> - <?php if ($topline_date) { ?><li class="item date"><time datetime="<?= $this->entry->machineReadableDate() ?>"><?= $this->entry->date() ?></time> </li><?php } ?> - <?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>" title="<?= + <?php if ($topline_date) { ?><li class="item date"><time datetime="<?= $this->entry->machineReadableDate() ?>" class="item-element"><?= $this->entry->date() ?></time> </li><?php } ?> + <?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?= $this->entry->link() ?>" class="item-element" title="<?= _t('conf.shortcut.see_on_website') ?>"><?= _i('link') ?></a></li><?php } ?> </ul> diff --git a/p/themes/Nord/nord.css b/p/themes/Nord/nord.css index 14c094985..ff51c608e 100644 --- a/p/themes/Nord/nord.css +++ b/p/themes/Nord/nord.css @@ -590,6 +590,7 @@ li.item.active { .flux:not(.current):hover .item.title { background: var(--accent-bg); transition: .4s; + bottom: 0; } .flux .item.title a { diff --git a/p/themes/Nord/nord.rtl.css b/p/themes/Nord/nord.rtl.css index e5a02502a..a76a6f5a9 100644 --- a/p/themes/Nord/nord.rtl.css +++ b/p/themes/Nord/nord.rtl.css @@ -590,6 +590,7 @@ li.item.active { .flux:not(.current):hover .item.title { background: var(--accent-bg); transition: .4s; + bottom: 0; } .flux .item.title a { diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 7f1b4f707..b5068abe4 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -721,6 +721,10 @@ a.signin { border-left: 3px solid #d9534f; } +.flux:not(.current):hover .item.title { + bottom: 0; +} + .flux .item.title a, .flux.not_read:not(.current):hover .item.title { color: #333; } @@ -747,8 +751,8 @@ a.signin { font-size: 0.9rem; } -.flux .website .favicon { - padding: 5px; +.flux_header .title .item-element { + padding: 0.425rem; } .flux .item.date { diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css index a3660a3e5..412aa3adf 100644 --- a/p/themes/Pafat/pafat.rtl.css +++ b/p/themes/Pafat/pafat.rtl.css @@ -721,6 +721,10 @@ a.signin { border-right: 3px solid #d9534f; } +.flux:not(.current):hover .item.title { + bottom: 0; +} + .flux .item.title a, .flux.not_read:not(.current):hover .item.title { color: #333; } @@ -747,8 +751,8 @@ a.signin { font-size: 0.9rem; } -.flux .website .favicon { - padding: 5px; +.flux_header .title .item-element { + padding: 0.425rem; } .flux .item.date { diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css index bb7192863..bef421dd0 100644 --- a/p/themes/base-theme/frss.css +++ b/p/themes/base-theme/frss.css @@ -570,11 +570,14 @@ input[type="checkbox"]:focus-visible { } .horizontal-list .item { - padding: 0.5rem 0; display: table-cell; vertical-align: middle; } +.horizontal-list .item .item-element { + padding: 0.5rem 0; +} + /*=== manage-list */ .manage-list { list-style: none; @@ -1118,7 +1121,6 @@ input[type="search"] { } .flux .flux_header .item { - padding: 0.5rem 0; white-space: nowrap; } diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css index f90d14ae4..8d7391be4 100644 --- a/p/themes/base-theme/frss.rtl.css +++ b/p/themes/base-theme/frss.rtl.css @@ -570,11 +570,14 @@ input[type="checkbox"]:focus-visible { } .horizontal-list .item { - padding: 0.5rem 0; display: table-cell; vertical-align: middle; } +.horizontal-list .item .item-element { + padding: 0.5rem 0; +} + /*=== manage-list */ .manage-list { list-style: none; @@ -1118,7 +1121,6 @@ input[type="search"] { } .flux .flux_header .item { - padding: 0.5rem 0; white-space: nowrap; } |
