From 33eef9688ba8b71dfc17487dd5a79221b0c332c0 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 18 Aug 2020 17:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp   | 6 +++---
 power-admin/src/main/webapp/static/css/comm.css             | 4 ++--
 .../src/main/webapp/static/css/gatewayPageStyles.css        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index 530577f..9bdb01c 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -127,17 +127,17 @@
                                             <span class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</span>
                                         </c:when>
                                         <c:otherwise>
-                                            <p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
+                                            <span class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</span>
                                         </c:otherwise>
                                     </c:choose>
                                 </c:when>
                                 <c:otherwise>
                                     <c:choose>
                                         <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
-                                            <p class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</p>
+                                            <span class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</span>
                                         </c:when>
                                         <c:otherwise>
-                                            <p class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</p>
+                                            <span class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</span>
                                         </c:otherwise>
                                     </c:choose>
                                 </c:otherwise>
diff --git a/power-admin/src/main/webapp/static/css/comm.css b/power-admin/src/main/webapp/static/css/comm.css
index e8c948d..b854e98 100644
--- a/power-admin/src/main/webapp/static/css/comm.css
+++ b/power-admin/src/main/webapp/static/css/comm.css
@@ -30,7 +30,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #c1d7e3;
+    background-color: #ecf0f5;
     padding: 10px;
 }
 /**
@@ -38,7 +38,7 @@
  */
 .main{
     background-color: white;
-    height: auto;
+    min-height: calc(100vh - 20px);
     border-radius: 5px;
 }
 /*表格外层div*/
diff --git a/power-admin/src/main/webapp/static/css/gatewayPageStyles.css b/power-admin/src/main/webapp/static/css/gatewayPageStyles.css
index 80934ba..e8756c6 100644
--- a/power-admin/src/main/webapp/static/css/gatewayPageStyles.css
+++ b/power-admin/src/main/webapp/static/css/gatewayPageStyles.css
@@ -29,7 +29,7 @@
   height: 120px;
   text-align: center;
   display: flex;
-  justify-content: space-evenly;
+  justify-content: space-around;
 }
 .iconContext{
   width:118px;