Просмотр исходного кода

less margin - wrapper div deleted (#8196)

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" />
maTh 4 месяцев назад
Родитель
Сommit
e3fedceeb9
3 измененных файлов с 42 добавлено и 44 удалено
  1. 40 42
      app/views/configure/display.phtml
  2. 1 1
      p/themes/base-theme/frss.css
  3. 1 1
      p/themes/base-theme/frss.rtl.css

+ 40 - 42
app/views/configure/display.phtml

@@ -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>
-								<div class="properties alert-error">
-									<div><?= _t('conf.display.theme_not_available', FreshRSS_Context::userConf()->theme)?></div>
+								<div>
+									<?php if (!empty($theme['deprecated'])) { ?>
+										<span class="deprecated"><?= _t('conf.display.theme.deprecated.description') ?></span><br />
+									<?php } ?>
+									<?= $theme['description'] ?>
 								</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>
 

+ 1 - 1
p/themes/base-theme/frss.css

@@ -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;

+ 1 - 1
p/themes/base-theme/frss.rtl.css

@@ -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;