fix

src/main/ui/manage.html

@@ -44,19 +44,23 @@
         .backgroud {
             background-image: url("/static/images/manage_bg.png");
         }
+
         .total_logo {
             padding-top: 4.62%;
             text-align: center;
         }
+
         .box-items {
             padding: 30px 15px 15px 15px;
             cursor: pointer;
 
         }
+
         .box-items img {
             width: 72px;
             height: 72px;
         }
+
         .boxs {
             display: flex;
             justify-content: center;
@@ -66,9 +70,11 @@
             background: #434365;
             border-radius: 5px;
         }
+
         .boxs:hover {
             background: #FFFFFF;
         }
+
         .box-font {
             font-family: PingFang-SC-Regular;
             font-size: 20px;
@@ -77,6 +83,7 @@
             text-align: center;
             padding-top: 25px;
         }
+
         footer {
             font-family: PingFang-SC-Regular;
             font-size: 12px;
@@ -84,6 +91,7 @@
             letter-spacing: 0px;
             padding-bottom: 2.3%;
         }
+
         .easypay {
             font-family: PingFang-SC-Regular;
             font-size: 20px;
@@ -92,6 +100,7 @@
             padding-top: 1%;
             padding-bottom: 1%;
         }
+
         .ng-cloak, [ng-cloak] {
             display: none !important;
         }
@@ -121,6 +130,49 @@
         .dh {
             animation: myfirst 1s linear 0s infinite alternate;
         }
+
+        .description-text {
+            margin-top: 5px;
+            /*width: 86px;*/
+        }
+
+        .list-group label {
+            border-bottom: 1px solid #333333;
+            font-size: 20px;
+            color: #333333;
+        }
+        .navbar-header a{
+            color: #FFF;
+        }
+        .navbar-header .active{
+            background-color: #FFF !important;
+        }
+        .navbar-header .active a{
+            color: #f06101 !important;
+        }
+        .navbar-header li {
+            float: left;
+            border: 1px solid #FFF;
+            padding: 3px 15px;
+        }
+        @media (min-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                position: absolute;
+                left: 0;
+                right: 0;
+                margin: 10px auto;
+            }
+        }
+
+        @media (max-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                margin: 10px auto;
+            }
+        }
     </style>
     <script type="text/javascript" src="static/lib/require.js" data-main="static/boot/manager-boot"></script>
     <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
@@ -152,7 +204,8 @@ margin-bottom: 10%;"/>
                 <!-- logo for regular state and mobile devices -->
                 <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
                                            style="max-height: 35px;">
-                        <!--<b>RoyalPay</b>-->
+                    <b>RoyalPay</b>
+
             </span>
             </a>
             <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
@@ -164,10 +217,20 @@ margin-bottom: 10%;"/>
                                            style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
                         ng-bind="currentUser.org.name"></b></span>
             </a>
-                <div class="navbar-header">
-                    <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
-                    <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
-                </div>
+            <ul class="navbar-header">
+                <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
+                    <a ui-sref="dashboard"  role="button">Dashboard</a>
+                </li>
+                <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;">
+                    <a ui-sref="listMenu({role:''})" role="button">Main Menu</a>
+                </li>
+            </ul>
+            <!--<div class="navbar-header">-->
+                <!--<a ui-sref="dashboard" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>-->
+                <!--<a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>-->
+            <!--</div>-->
             <!-- Header Navbar: style can be found in header.less -->
             <!--顶部导航栏-->
             <div class="navbar-custom-menu">
@@ -195,7 +258,8 @@ margin-bottom: 10%;"/>
                         <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
                             <!-- User image -->
                             <li class="user-header user-header-yedian">
-                                    <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                     class="img-circle"
                                      alt="User Image">
 
                                 <p>
@@ -244,7 +308,7 @@ margin-bottom: 10%;"/>
             </div>
         </nav>
     </header>
-            <div style="min-height: 890px" ui-view>
+    <div class="content-wrapper autoheight" style="margin-left: 0" ui-view>
         <div class="backgroud">
             <div class="total_logo">
                 <a><img src="/static/images/manage_total_logo.png"> </a>
@@ -254,7 +318,7 @@ margin-bottom: 10%;"/>
 
             </div>
 
-                <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
+            <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
                 <div class="box-items" ng-if="'10'|withRole">
                     <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">