From 9e0628e2959c85600c651c1ae8fe2edb3591a187 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 29 Dec 2020 09:13:15 +0800
Subject: [PATCH] * Fix user bar style.

---
 module/common/model.php     |  3 ++-
 module/index/css/index.css  | 11 +++++++++++
 www/theme/default/style.css | 10 ----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 3c91e216e1..e13663611c 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -281,8 +281,9 @@ class commonModel extends model
             echo "<ul class='dropdown-menu pull-right'>";
             if(!$isGuest)
             {
+                $noRole = (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role])) ? '' : ' no-role';
                 echo '<li class="user-profile-item">';
-                echo "<a href='" . helper::createLink('my', 'profile', '', '', true) . "' class=iframe '" . (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role]) ? '' : ' no-role') . "'>";
+                echo "<a href='" . helper::createLink('my', 'profile', '', '', true) . "' class='iframe $noRole'" . '>';
                 echo "<div class='avatar avatar bg-secondary avatar-circle'>" . strtoupper($app->user->account[0]) . "</div>\n";
                 echo '<div class="user-profile-name">' . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</div>';
                 if(isset($lang->user->roleList[$app->user->role])) echo '<div class="user-profile-role">' . $lang->user->roleList[$app->user->role] . '</div>';
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 31e37f805a..8b9061c484 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -13,3 +13,14 @@
 #bars > li.active:after {content: ' '; display: block; position: absolute; background: #a0cafa; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
 
 .menu-hide #pagesBar {left: 40px}
+
+#userNav{float: none; margin: 0;} 
+#userNav>li{text-align: center}
+#userNav>li>a{padding: 6px 6px;color: #fff; opacity: .9;margin-left: 0px}
+#userNav>li>a:hover{background: #0c64eb;}
+#userNav>li>.dropdown-menu{left: 100%; top: -290px; width: 140px;text-align: left; background: #3c495c;}
+#userNav>li>.dropdown-menu a{color: #fff}
+#userNav>li>.dropdown-menu .dropdown-menu{left: 100%; text-align: left; background: #3c495c}
+#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu{top: -60px}
+#userNav .dropdown-menu>li>a>.icon { position: initial;  display: inline;}
+#userNav li.open>a{background:#0c64eb}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e71282ff2a..346cf033d2 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -60,13 +60,3 @@ a.showMoreImage:hover {opacity: 1;}
 .table-actions .btn:hover{background: #b3d4fc}
 
 #menuFooter{height: 50px}
-
-#userNav{float: none; margin: 0;}
-#userNav>li{text-align: center}
-#userNav>li>a{padding: 6px 6px;color: #fff; opacity: .9;margin-left: 0px}
-#userNav>li>a:hover{background: #0c64eb;}
-#userNav>li>.dropdown-menu{left: 100%; top: -300px; width: 140px;text-align: left; background: #3c495c; z-index: 999999}
-#userNav>li>.dropdown-menu a{color: #fff}
-#userNav>li>.dropdown-menu .dropdown-menu{left: 100%; text-align: left; background: #3c495c}
-#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu{top: -60px}
-#userNav .dropdown-menu>li>a>.icon { position: initial;  display: inline;}