Skip to content

Replace arrow navigation in theme switcher with <select> #8190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alkarex merged 1 commit into from
Nov 6, 2025
Merged

Replace arrow navigation in theme switcher with <select> #8190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 13 additions & 22 deletions app/views/configure/display.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,27 @@
<div class="form-group">
<label class="group-name" for="theme"><?= _t('conf.display.theme') ?></label>
<div class="group-controls">
<select id="theme" name="theme">
<?php foreach ($this->themes as $theme): ?>
<option value="<?= $theme['id'] ?>"<?= FreshRSS_Context::userConf()->theme === $theme['id'] ? ' selected' : '' ?>><?= $theme['name'] ?></option>
<?php endforeach ?>
</select>

<div class="theme-preview-list-wrapper">
<ul class="theme-preview-list">
<?php $slides = count($this->themes); $i = 1; $themeAvailable = false; ?>
<?php
foreach ($this->themes as $theme) { ?>
<?php if (FreshRSS_Context::userConf()->theme === $theme['id']) {
$checked = 'checked="checked"';
<?php
$isCurrent = FreshRSS_Context::userConf()->theme === $theme['id'];
if ($isCurrent) {
$themeAvailable = true;
} else {
$checked = '';
} ?>
<input type="radio" name="theme" id="img-<?= $i ?>" <?= $checked ?> value="<?= $theme['id'] ?>" />
<li class="preview-container">
}
?>
<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="nav">
<?php if ($i !== 1) {?>
<label for="img-<?= $i - 1 ?>" class="btn prev"><?= _i('prev') ?></label>
<?php } ?>
<?php if ($i !== $slides) {?>
<label for="img-<?= $i + 1 ?>" class="btn next"><?= _i('next') ?></label>
<?php } ?>
</div>
<div class="properties">
<div>
<?php if (!empty($theme['deprecated'])) { ?>
Expand All @@ -83,20 +80,14 @@
<?php if (!empty($theme['theme-color']['dark'])) { ?>
<div class="darkMode">✔ <?= _t('conf.display.darkMode') ?></div>
<?php } ?>

</div>
<div class="page-number">( <?= sprintf('%d/%d', $i, $slides) ?> )</div>
</li>
<?php $i++ ?>
<?php } ?>
<?php if (!$themeAvailable) {?>
<input type="radio" name="theme" checked="checked" value="Origine" />
<li class="preview-container">
<li class="preview-container picked">
<div class="preview">
</div>
<div class="nav">
<label for="img-<?= $i - 1 ?>" class="prev"><?= _i('prev') ?></label>
</div>
<div class="properties alert-error">
<div><?= _t('conf.display.theme_not_available', FreshRSS_Context::userConf()->theme)?></div>
</div>
Expand Down
14 changes: 14 additions & 0 deletions p/scripts/extra.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,19 @@ function init_crypto_forms() {
// </crypto form (Web login)>

// <show password>

function init_display(parent) {
const theme = parent.querySelector('select#theme');
if (!theme) {
return;
}
theme.addEventListener('change', (e) => {
const picked = parent.querySelector('.preview-container.picked');
picked.classList.remove('picked');
parent.querySelector(`[data-theme-preview="${e.target.value}"]`).classList.add('picked');
});
}

function togglePW(btn) {
if (btn.classList.contains('active')) {
hidePW(btn);
Expand Down Expand Up @@ -543,6 +556,7 @@ function init_extra_afterDOM() {
init_archiving(slider);
init_url_observers(slider);
} else {
init_display(document.body);
init_archiving(document.body);
init_url_observers(document.body);
}
Expand Down
40 changes: 2 additions & 38 deletions p/themes/base-theme/frss.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,10 +2114,6 @@ html.slider-active {
min-width: 260px;
}

.theme-preview-list input {
display: none;
}

.theme-preview-list .preview-container {
display: block;
}
Expand All @@ -2136,19 +2132,6 @@ html.slider-active {
height: 100%;
}

.theme-preview-list .nav label {
padding: 0;
display: none;
min-width: 50px;
min-height: 5rem;
position: absolute;
top: 34%;
z-index: 9;
text-align: center;
line-height: 5;
}


.theme-preview-list .properties {
padding: 5px;
background-color: var(--frss-background-color-transparent);
Expand All @@ -2161,32 +2144,13 @@ html.slider-active {
backdrop-filter: blur(3px);
}

.theme-preview-list .page-number {
bottom: -1.5rem;
position: absolute;
display: none;
left: 0;
right: 0;
text-align: center;
}

.theme-preview-list .nav label.prev {
left: -1rem;
}

.theme-preview-list .nav label.next {
right: -1rem;
}

.theme-preview-list input:checked + .preview-container .preview {
.preview-container.picked .preview {
opacity: 1;
transform: scale(1);
transition: opacity .5s ease-in-out;
}

.theme-preview-list input:checked + .preview-container .nav label,
.theme-preview-list input:checked + .preview-container .properties,
.theme-preview-list input:checked + .preview-container .page-number {
.preview-container.picked .properties {
display: block;
}

Expand Down
40 changes: 2 additions & 38 deletions p/themes/base-theme/frss.rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,10 +2114,6 @@ html.slider-active {
min-width: 260px;
}

.theme-preview-list input {
display: none;
}

.theme-preview-list .preview-container {
display: block;
}
Expand All @@ -2136,19 +2132,6 @@ html.slider-active {
height: 100%;
}

.theme-preview-list .nav label {
padding: 0;
display: none;
min-width: 50px;
min-height: 5rem;
position: absolute;
top: 34%;
z-index: 9;
text-align: center;
line-height: 5;
}


.theme-preview-list .properties {
padding: 5px;
background-color: var(--frss-background-color-transparent);
Expand All @@ -2161,32 +2144,13 @@ html.slider-active {
backdrop-filter: blur(3px);
}

.theme-preview-list .page-number {
bottom: -1.5rem;
position: absolute;
display: none;
right: 0;
left: 0;
text-align: center;
}

.theme-preview-list .nav label.prev {
right: -1rem;
}

.theme-preview-list .nav label.next {
left: -1rem;
}

.theme-preview-list input:checked + .preview-container .preview {
.preview-container.picked .preview {
opacity: 1;
transform: scale(1);
transition: opacity .5s ease-in-out;
}

.theme-preview-list input:checked + .preview-container .nav label,
.theme-preview-list input:checked + .preview-container .properties,
.theme-preview-list input:checked + .preview-container .page-number {
.preview-container.picked .properties {
display: block;
}

Expand Down