From 2a525e2f53d85425cb32fa783612344e84eee591 Mon Sep 17 00:00:00 2001
From: harukin <harukin0731@gmail.com>
Date: Wed, 2 Jan 2019 20:48:16 +0900
Subject: [PATCH] fix dropdown position & edit name and setting icon position

---
 view/theme/plusfuture/css/style.css          |  5 +++
 view/theme/plusfuture/tpl/navbar_default.tpl | 36 ++++++++++----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css
index ddaeb68..59e40fb 100644
--- a/view/theme/plusfuture/css/style.css
+++ b/view/theme/plusfuture/css/style.css
@@ -2194,3 +2194,8 @@ a[title*="pawoo.net"]::after {
 .comment-edit-preview .toplevel_item {
   width: calc(100% - 16px);
 }
+
+.dropdown-menu.show{
+  position: absolute;
+  left: -215px;
+}
\ No newline at end of file
diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl
index 86f8065..df9962c 100755
--- a/view/theme/plusfuture/tpl/navbar_default.tpl
+++ b/view/theme/plusfuture/tpl/navbar_default.tpl
@@ -16,6 +16,24 @@
 	{{/if}}
 </div>
 {{/if}}
+{{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">
+		{{$sel.name}}
+		{{if $sitelocation}}
+		<br><small>{{$sitelocation}}</small>
+		{{/if}}
+	</a>
+
+</div>
+{{if $settings_url}}
+<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
+	<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
+		<i class="fa fa-fw fa-cog"></i>
+	</a>
+</div>
+{{/if}}
+{{/if}}
 <div class="navbar-toggler-right">
 	{{if $nav.help.6}}
 	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
@@ -212,22 +230,4 @@
 	</div>
 	{{/if}}
 </div>
-{{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">
-		{{$sel.name}}
-		{{if $sitelocation}}
-		<br><small>{{$sitelocation}}</small>
-		{{/if}}
-	</a>
-
-</div>
-{{if $settings_url}}
-<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
-	<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
-		<i class="fa fa-fw fa-cog"></i>
-	</a>
-</div>
-{{/if}}
-{{/if}}
 {{/if}}
\ No newline at end of file