mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2025-12-24 05:57:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

less margin - wrapper div deleted (#8196)

Browse Source 
Follow up https://github.com/FreshRSS/FreshRSS/pull/8190 and https://github.com/FreshRSS/FreshRSS/pull/8152

before:
<img width="1090" height="449" alt="grafik" src="https://github.com/user-attachments/assets/ee6a54a2-3602-4f2c-8eb2-cb186287e245" />


After:
<img width="907" height="452" alt="grafik" src="https://github.com/user-attachments/assets/3a3066e5-90e1-4b65-a1c4-18964494f644" />
This commit is contained in:
maTh
2025-11-08 22:53:28 +01:00
committed by GitHub
parent 8cb2158a39
commit e3fedceeb9
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/views/configure/display.phtml
View File

@@ -49,52 +49,50 @@
<?php endforeach ?>
</select>
<div class="theme-preview-list-wrapper">
<ul class="theme-preview-list">
<?php $slides = count($this->themes); $i = 1; $themeAvailable = false; ?>
<ul class="theme-preview-list">
<?php $slides = count($this->themes); $i = 1; $themeAvailable = false; ?>
<?php
foreach ($this->themes as $theme) { ?>
<?php
foreach ($this->themes as $theme) { ?>
<?php
$isCurrent = FreshRSS_Context::userConf()->theme === $theme['id'];
if ($isCurrent) {
$themeAvailable = true;
}
?>
<li class="preview-container<?= $isCurrent ? ' picked' : '' ?>" data-theme-preview="<?= $theme['id'] ?>">
<div class="preview">
<img src="<?= Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png') ?>" loading="lazy" />
</div>
<div class="properties">
<div>
<?php if (!empty($theme['deprecated'])) { ?>
<span class="deprecated error"><?= _t('conf.display.theme.deprecated') ?>:</span>
<?php } ?>
<?= sprintf('%s — %s %s', $theme['name'], _t('gen.short.by_author'), $theme['author']) ?>
</div>
<div>
<?php if (!empty($theme['deprecated'])) { ?>
<span class="deprecated"><?= _t('conf.display.theme.deprecated.description') ?></span><br />
<?php } ?>
<?= $theme['description'] ?>
</div>
<?php if (!empty($theme['theme-color']['dark'])) { ?>
<div class="darkMode">✔ <?= _t('conf.display.darkMode') ?></div>
$isCurrent = FreshRSS_Context::userConf()->theme === $theme['id'];
if ($isCurrent) {
$themeAvailable = true;
}
?>
<li class="preview-container<?= $isCurrent ? ' picked' : '' ?>" data-theme-preview="<?= $theme['id'] ?>">
<div class="preview">
<img src="<?= Minz_Url::display('/themes/' . $theme['id'] . '/thumbs/original.png') ?>" loading="lazy" />
</div>
<div class="properties">
<div>
<?php if (!empty($theme['deprecated'])) { ?>
<span class="deprecated error"><?= _t('conf.display.theme.deprecated') ?>:</span>
<?php } ?>
<?= sprintf('%s — %s %s', $theme['name'], _t('gen.short.by_author'), $theme['author']) ?>
</div>
</li>
<?php $i++ ?>
<?php } ?>
<?php if (!$themeAvailable) {?>
<li class="preview-container picked">
<div class="preview">
<div>
<?php if (!empty($theme['deprecated'])) { ?>
<span class="deprecated"><?= _t('conf.display.theme.deprecated.description') ?></span><br />
<?php } ?>
<?= $theme['description'] ?>
</div>
<div class="properties alert-error">
<div><?= _t('conf.display.theme_not_available', FreshRSS_Context::userConf()->theme)?></div>
</div>
</li>
<?php }?>
</ul>
</div>
<?php if (!empty($theme['theme-color']['dark'])) { ?>
<div class="darkMode">✔ <?= _t('conf.display.darkMode') ?></div>
<?php } ?>
</div>
</li>
<?php $i++ ?>
<?php } ?>
<?php if (!$themeAvailable) {?>
<li class="preview-container picked">
<div class="preview">
</div>
<div class="properties alert-error">
<div><?= _t('conf.display.theme_not_available', FreshRSS_Context::userConf()->theme)?></div>
</div>
</li>
<?php }?>
</ul>
</div>
</div>

2
p/themes/base-theme/frss.css
View File

@@ -2104,7 +2104,7 @@ html.slider-active {
/*=== SLIDESHOW Theme Preview */
/*==============*/
.theme-preview-list {
margin: 0.5rem 1rem 2rem 1rem;
margin: 0.5rem 0;
padding: 0;
display: block;
max-width: 640px;

2
p/themes/base-theme/frss.rtl.css
View File

@@ -2104,7 +2104,7 @@ html.slider-active {
/*=== SLIDESHOW Theme Preview */
/*==============*/
.theme-preview-list {
margin: 0.5rem 1rem 2rem 1rem;
margin: 0.5rem 0;
padding: 0;
display: block;
max-width: 640px;