From e1ad4fc7337beda58ed8c6caf71318e733a67e6a Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Tue, 24 Oct 2023 23:43:50 +0200
Subject: Navigation buttons: Group icons (.group instead of .stick) (#5737)

* replace stick with group + update the themes

* Update nav_menu.phtml

---------

Co-authored-by: math-gh <>
---
 app/layout/nav_menu.phtml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 0937fe61f..418b6c54c 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -4,11 +4,13 @@
 
 <nav class="nav_menu">
 	<?php if ($actual_view === 'normal' || $actual_view === 'reader') { ?>
-	<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
+		<div class="group">
+			<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
+		</div>
 	<?php } ?>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<div id="nav_menu_actions" class="stick">
+	<div id="nav_menu_actions" class="group">
 		<?php
 			$states = array(
 				'read' => FreshRSS_Entry::STATE_READ,
@@ -136,7 +138,7 @@
 		$mark_unread_url['params']['nextGet'] = $get;
 	?>
 
-	<div class="stick" id="nav_menu_read_all">
+	<div class="group stick" id="nav_menu_read_all">
 		<form id="mark-read-menu" method="post">
 		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 		<button class="read_all btn <?= $confirm ?>"
@@ -190,7 +192,7 @@
 	<?php } ?>
 
 	<?php $url_output = Minz_Request::currentRequest(); ?>
-	<div class="stick" id="nav_menu_views">
+	<div class="group" id="nav_menu_views">
 		<?php
 		$readingModes = FreshRSS_ReadingMode::getReadingModes();
 		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
@@ -223,7 +225,7 @@
 
 	<?php $nav_menu_hooks = Minz_ExtensionManager::callHook('nav_menu'); ?>
 	<?php if ($nav_menu_hooks != '') { ?>
-	<div class="stick" id="nav_menu_hooks">
+	<div class="group" id="nav_menu_hooks">
 		<?= $nav_menu_hooks ?>
 	</div>
 	<?php } ?>
@@ -241,12 +243,16 @@
 		$url_order = Minz_Request::currentRequest();
 		$url_order['params']['order'] = $order;
 	?>
-	<a id="toggle-order" class="btn" href="<?= Minz_Url::display($url_order) ?>" title="<?= $title ?>">
-		<?= _i($icon) ?>
-	</a>
+	<div class="group">
+		<a id="toggle-order" class="btn" href="<?= Minz_Url::display($url_order) ?>" title="<?= $title ?>">
+			<?= _i($icon) ?>
+		</a>
+	</div>
 
 	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?>
-	<a id="actualize" class="btn" href="<?= _url('feed', 'actualize') ?>" title="<?= _t('gen.action.actualize') ?>"><?= _i('refresh') ?></a>
+		<div class="group">
+			<a id="actualize" class="btn" href="<?= _url('feed', 'actualize') ?>" title="<?= _t('gen.action.actualize') ?>"><?= _i('refresh') ?></a>
+		</div>
 	<?php } ?>
 </nav>
 <?php flush(); ?>
-- 
cgit v1.2.3