From d99d880755b1f8473c20a5f83b9fea16e44b8379 Mon Sep 17 00:00:00 2001
From: harukin <harukin0731@gmail.com>
Date: Wed, 2 Jan 2019 21:02:42 +0900
Subject: [PATCH] edit move noti/expand button

---
 view/theme/plusfuture/tpl/navbar_default.tpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl
index df9962c..d78335f 100755
--- a/view/theme/plusfuture/tpl/navbar_default.tpl
+++ b/view/theme/plusfuture/tpl/navbar_default.tpl
@@ -16,6 +16,10 @@
 	{{/if}}
 </div>
 {{/if}}
+
+	<button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
+		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	</button>
 {{if $sel.name}}
 <div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
 	<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate">
@@ -40,17 +44,14 @@
 		<i class="fa fa-question-circle"></i>
 	</button>
 	{{/if}}
-	<button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
-		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+		<i class="fa fa-bars"></i>
 	</button>
 	{{if $localuser || $nav.pubs}}
 	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
 		<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
 	</button>
 	{{/if}}
-	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
-		<i class="fa fa-bars"></i>
-	</button>
 </div>
 <div class="collapse navbar-collapse" id="navbar-collapse-1">
 	<ul class="navbar-nav mr-auto">