Skip to content
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

Jump to bottom

Improved: Remove <li> as separator #4597

Merged
merged 8 commits into from Oct 3, 2022
Merged

Improved: Remove <li> as separator #4597

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05527b7
templates
math-GH Sep 10, 2022
08e7fb8
themes
math-GH Sep 10, 2022
6a213f3
fix
math-GH Sep 10, 2022
df0625c
fix
math-GH Sep 10, 2022
6874499
Merge branch 'edge' into remove-separator
math-GH Sep 27, 2022
18f5fa1
fixes
math-GH Sep 27, 2022
9b6c6c1
fix
math-GH Sep 27, 2022
7ee839a
Merge remote-tracking branch 'upstream/edge' into remove-separator
math-GH Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/layout/aside_feed.phtml
View file
Open in desktop
Expand Up @@ -163,9 +163,7 @@
<li class="item"><a href="<?= _url('stats', 'repartition', 'id', '------') ?>"><?= _t('index.menu.stats') ?></a></li>
<?php } ?>
<li class="item link website"><a target="_blank" rel="noreferrer" href="http://example.net/"><?= _t('gen.action.see_website') ?></a></li>
<?php if (FreshRSS_Auth::hasAccess()) { ?>
<li class="separator"></li>
<?php
<?php if (FreshRSS_Auth::hasAccess()) {
$get = Minz_Request::param('get');
if (!$get) {
$url = _url('subscription', 'feed', 'id', '------', 'from', $actual_view);
Expand Down
3 changes: 0 additions & 3 deletions app/layout/header.phtml
View file
Open in desktop
Expand Up @@ -55,7 +55,6 @@
<?php else: ?>
<li class="item"><span class="signout">(<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>)</span></li>
<?php endif; ?>
<li class="separator"></li>
<li class="dropdown-header"><?= _t('gen.menu.configuration') ?></li>
<li class="item"><a href="<?= _url('configure', 'display') ?>"><?= _t('gen.menu.display') ?></a></li>
<li class="item"><a href="<?= _url('configure', 'reading') ?>"><?= _t('gen.menu.reading') ?></a></li>
Expand All @@ -67,7 +66,6 @@
<?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>

<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
<li class="separator"></li>
<li class="dropdown-header"><?= _t('gen.menu.admin') ?></li>
<li class="item"><a href="<?= _url('configure', 'system') ?>"><?= _t('gen.menu.system') ?></a></li>
<li class="item"><a href="<?= _url('user', 'manage') ?>"><?= _t('gen.menu.user_management') ?></a></li>
Expand All @@ -79,7 +77,6 @@
<?= Minz_ExtensionManager::callHook('menu_admin_entry') ?>
<?php } ?>

<li class="separator"></li>
<li class="item"><a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a></li>
<li class="item"><a href="<?= _url('index', 'about') ?>"><?= _t('gen.menu.about') ?></a></li>
<?= Minz_ExtensionManager::callHook('menu_other_entry') ?>
Expand Down
19 changes: 9 additions & 10 deletions app/layout/nav_menu.phtml
View file
Open in desktop
Expand Up @@ -50,16 +50,17 @@
</li>
<?php endforeach; ?>

<?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
<li class="separator"></li>
<?php } ?>

<?php
$url_query = Minz_Request::currentRequest();;
$classSeparator = '';
if (count(FreshRSS_Context::$user_conf->queries) > 0) {
$classSeparator = ' separator';
}

$url_query = Minz_Request::currentRequest();
$url_query['c'] = 'configure';
$url_query['a'] = 'bookmarkQuery';
?>
<li class="item"><a href="<?= Minz_Url::display($url_query) ?>"><?= _i('bookmark-add') ?> <?= _t('index.menu.bookmark_query') ?></a></li>
<li class="item<?= $classSeparator ?>"><a href="<?= Minz_Url::display($url_query) ?>"><?= _i('bookmark-add') ?> <?= _t('index.menu.bookmark_query') ?></a></li>
</ul>
<a class="dropdown-close" href="#close">❌</a>
</div>
Expand Down Expand Up @@ -112,7 +113,6 @@
formaction="<?= Minz_Url::display($mark_read_url) ?>"
type="submit"><?= $string_mark ?></button>
</li>
<li class="separator"></li>
<?php
$today = @strtotime('today');
$mark_before_today = $mark_read_url;
Expand All @@ -121,7 +121,7 @@
$mark_before_one_week['params']['idMax'] = ($today - 604800) . '000000';
$mark_unread_enabled = FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) or !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ);
?>
<li class="item">
<li class="item separator">
<button class="as-link <?= $confirm ?>"
form="mark-read-menu"
formaction="<?= Minz_Url::display($mark_before_today) ?>"
Expand All @@ -133,8 +133,7 @@
formaction="<?= Minz_Url::display($mark_before_one_week) ?>"
type="submit"><?= _t('index.menu.before_one_week') ?></button>
</li>
<li class="separator"></li>
<li class="item">
<li class="item separator">
<button class="as-link <?= $mark_unread_enabled ? $confirm : '" disabled="disabled' ?>"
form="mark-read-menu"
formaction="<?= Minz_Url::display($mark_unread_url) ?>"
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Alternative-Dark/adark.css
View file
Open in desktop
Expand Up @@ -332,9 +332,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #292929;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #292929;
}

/*=== Alerts */
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Alternative-Dark/adark.rtl.css
View file
Open in desktop
Expand Up @@ -332,9 +332,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #292929;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #292929;
}

/*=== Alerts */
Expand Down
32 changes: 24 additions & 8 deletions p/themes/Ansum/_components.scss
View file
Open in desktop
Expand Up @@ -38,8 +38,7 @@
}

.dropdown-header {
// padding: 0 5px 5px;
margin: 1rem 0.5rem 1rem 1rem;
padding: 1rem 0.5rem 1rem 1rem;
font-weight: bold;
text-align: left;
color: variables.$grey-dark;
Expand Down Expand Up @@ -74,12 +73,35 @@
}
}

&:not(.addItem) {
a:hover,
button:hover {
background: variables.$main-first;
color: variables.$white;

.icon {
filter: brightness(3);
}
}
}

&[aria-checked="true"] {
a::before {
margin: 0 0 0 -14px;
font-weight: bold;
}
}

~ .dropdown-header {
margin-top: 0.75rem;
padding-top: 1.75rem;
border-top-color: variables.$grey-light;
}

&.separator {
margin-top: 0.75rem;
border-top-color: variables.$grey-light;
}
}

.input {
Expand All @@ -90,12 +112,6 @@
}
}

.separator {
margin: 0.75rem 0;
border-bottom: 1px solid variables.$grey-light;
// display: none;
}

}

.tree .tree-folder .tree-folder-items .dropdown-menu {
Expand Down
28 changes: 20 additions & 8 deletions p/themes/Ansum/ansum.css
View file
Open in desktop
Expand Up @@ -243,7 +243,7 @@ form th {
right: 17px;
}
.dropdown-menu .dropdown-header {
margin: 1rem 0.5rem 1rem 1rem;
padding: 1rem 0.5rem 1rem 1rem;
font-weight: bold;
text-align: left;
color: #766556;
Expand All @@ -270,19 +270,33 @@ form th {
.dropdown-menu .item:not(.addItem):hover .icon {
filter: grayscale(100%) brightness(2.5);
}
.dropdown-menu .item:not(.addItem) a:hover,
.dropdown-menu .item:not(.addItem) button:hover {
background: #ca7227;
color: #fff;
}
.dropdown-menu .item:not(.addItem) a:hover .icon,
.dropdown-menu .item:not(.addItem) button:hover .icon {
filter: brightness(3);
}
.dropdown-menu .item[aria-checked=true] a::before {
margin: 0 0 0 -14px;
font-weight: bold;
}
.dropdown-menu .item ~ .dropdown-header {
margin-top: 0.75rem;
padding-top: 1.75rem;
border-top-color: #f5f0ec;
}
.dropdown-menu .item.separator {
margin-top: 0.75rem;
border-top-color: #f5f0ec;
}
.dropdown-menu .input select, .dropdown-menu .input input {
margin: 0 auto 5px;
padding: 2px 5px;
border-radius: 3px;
}
.dropdown-menu .separator {
margin: 0.75rem 0;
border-bottom: 1px solid #f5f0ec;
}

.tree .tree-folder .tree-folder-items .dropdown-menu .item {
padding: 0;
Expand Down Expand Up @@ -1360,6 +1374,4 @@ body.register {
a, button.as-link {
outline: none;
color: #ca7227;
}

/*# sourceMappingURL=ansum.css.map */
}
26 changes: 20 additions & 6 deletions p/themes/Ansum/ansum.rtl.css
View file
Open in desktop
Expand Up @@ -243,7 +243,7 @@ form th {
left: 17px;
}
.dropdown-menu .dropdown-header {
margin: 1rem 1rem 1rem 0.5rem;
padding: 1rem 1rem 1rem 0.5rem;
font-weight: bold;
text-align: right;
color: #766556;
Expand All @@ -270,19 +270,33 @@ form th {
.dropdown-menu .item:not(.addItem):hover .icon {
filter: grayscale(100%) brightness(2.5);
}
.dropdown-menu .item:not(.addItem) a:hover,
.dropdown-menu .item:not(.addItem) button:hover {
background: #ca7227;
color: #fff;
}
.dropdown-menu .item:not(.addItem) a:hover .icon,
.dropdown-menu .item:not(.addItem) button:hover .icon {
filter: brightness(3);
}
.dropdown-menu .item[aria-checked=true] a::before {
margin: 0 -14px 0 0;
font-weight: bold;
}
.dropdown-menu .item ~ .dropdown-header {
margin-top: 0.75rem;
padding-top: 1.75rem;
border-top-color: #f5f0ec;
}
.dropdown-menu .item.separator {
margin-top: 0.75rem;
border-top-color: #f5f0ec;
}
.dropdown-menu .input select, .dropdown-menu .input input {
margin: 0 auto 5px;
padding: 2px 5px;
border-radius: 3px;
}
.dropdown-menu .separator {
margin: 0.75rem 0;
border-bottom: 1px solid #f5f0ec;
}

.tree .tree-folder .tree-folder-items .dropdown-menu .item {
padding: 0;
Expand Down Expand Up @@ -1360,4 +1374,4 @@ body.register {
a, button.as-link {
outline: none;
color: #ca7227;
}
}
11 changes: 3 additions & 8 deletions p/themes/BlueLagoon/BlueLagoon.css
View file
Open in desktop
Expand Up @@ -365,10 +365,6 @@ a.btn {
transform: rotate(45deg);
}

.configure .dropdown-header {
display: none;
}

.dropdown-header {
padding: 0 5px 5px;
color: #ccc;
Expand Down Expand Up @@ -404,10 +400,9 @@ a.btn {
margin: 0 0 0 -14px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #171717;
box-shadow: 0 1px rgba(255,255,255,0.08);
.item ~ .dropdown-header,
.item.separator {
border-top-color: rgba(255,255,255,0.08);
}

/*=== Alerts */
Expand Down
11 changes: 3 additions & 8 deletions p/themes/BlueLagoon/BlueLagoon.rtl.css
View file
Open in desktop
Expand Up @@ -365,10 +365,6 @@ a.btn {
transform: rotate(-45deg);
}

.configure .dropdown-header {
display: none;
}

.dropdown-header {
padding: 0 5px 5px;
color: #ccc;
Expand Down Expand Up @@ -404,10 +400,9 @@ a.btn {
margin: 0 -14px 0 0;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #171717;
box-shadow: 0 1px rgba(255,255,255,0.08);
.item ~ .dropdown-header,
.item.separator {
border-top-color: rgba(255,255,255,0.08);
}

/*=== Alerts */
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Dark/dark.css
View file
Open in desktop
Expand Up @@ -384,9 +384,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #333;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #333;
}

/*=== Alerts */
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Dark/dark.rtl.css
View file
Open in desktop
Expand Up @@ -384,9 +384,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #333;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #333;
}

/*=== Alerts */
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Flat/flat.css
View file
Open in desktop
Expand Up @@ -386,9 +386,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #ddd;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #ddd;
}

/*=== Alerts */
Expand Down
6 changes: 3 additions & 3 deletions p/themes/Flat/flat.rtl.css
View file
Open in desktop
Expand Up @@ -386,9 +386,9 @@ a.btn {
border-radius: 3px;
}

.separator {
margin: 5px 0;
border-bottom: 1px solid #ddd;
.item ~ .dropdown-header,
.item.separator {
border-top-color: #ddd;
}

/*=== Alerts */
Expand Down