From 8530926208c5edb88f6935a1b8fd6acef317307c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 28 五月 2024 15:09:10 +0800
Subject: [PATCH] add logo

---
 javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css   |    6 ++++--
 javaweb-plus/javaweb-admin/src/main/resources/static/img/logo.png    |    0 
 javaweb-plus/javaweb-admin/src/main/resources/templates/index.html   |    9 ++++++---
 javaweb-plus/javaweb-admin/src/main/resources/static/images/logo.png |    0 
 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html    |   27 +++++++++++++--------------
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
index 306c930..c0c0755 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/css/skins.css
@@ -791,7 +791,8 @@
 }
 
 .theme-dark .nav>li.active {
-	background: #293846;
+	/*background: #293846;*/
+	background: rgb(44, 46, 68);
 }
 
 .theme-dark .navbar-static-side {
@@ -804,7 +805,8 @@
 
 .theme-dark .navbar-default .nav>li>a:hover,
 .theme-dark .navbar-default .nav>li>a:focus {
-	background: #293846;
+	background: rgba(24,144,255,.85);
+	/*background: #293846;*/
 }
 
 /** 娴呰壊涓婚 theme-light **/
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/images/logo.png b/javaweb-plus/javaweb-admin/src/main/resources/static/images/logo.png
new file mode 100644
index 0000000..c95fbc4
--- /dev/null
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/images/logo.png
Binary files differ
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/img/logo.png b/javaweb-plus/javaweb-admin/src/main/resources/static/img/logo.png
new file mode 100644
index 0000000..c95fbc4
--- /dev/null
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/img/logo.png
Binary files differ
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
index 3fd61a8..6b0a52d 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
@@ -28,9 +28,12 @@
         <div class="sidebar-collapse">
             <ul class="nav" id="side-menu">
                 <a th:href="@{/index}">
-                  <li class="logo">
-				    <span class="logo-lg" >閽绘帰宸ョ▼骞冲彴</span>
-            	  </li>
+<!--                  <li class="logo">-->
+<!--				    <span class="logo-lg" >閽绘帰宸ョ▼骞冲彴</span>-->
+<!--            	  </li>-->
+					<li style="margin: 36px auto;text-align: center">
+						<img th:src="@{/images/logo.png}">
+					</li>
             	</a>
             	<li>
 <!--            		<div class="user-panel">-->
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 89c9673..2ab0029 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -85,7 +85,7 @@
 		padding: 0 40px;
 		align-content: center;
 	}
-	.ilblock span{
+	.ilblock>span{
 		display: block;
 		line-height: 30px;
 	}
@@ -150,19 +150,18 @@
 					</div>
 
 					<div style="flex:6;" class="ilblock">
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							鍗忚皟涓�
-							<span style="float: right">
-								{{indexDataCount.projectStatus0}}
-							</span>
+							<span style="float: right">{{indexDataCount.projectStatus0}}</span>
 <!--							<li class="el-icon-caret-bottom" style="color: #f56c6c">-->
+
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							寰呭紑宸�
 							<span style="float: right">{{indexDataCount.projectStatus1}}</span>
 <!--						    <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							杩涜涓�
 							<span style="float: right">{{indexDataCount.projectStatus2}}</span>
 <!--							<li class="el-icon-caret-top" style="color: #409eff">-->
@@ -186,11 +185,11 @@
 					</div>
 
 					<div style="flex:6;" class="ilblock">
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							鎬昏繘灏� <span style="float: right">{{indexDataCount.footageCount}}m</span>
 <!--							<li class="el-icon-caret-bottom" style="color: #f56c6c">-->
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							宸插畬鎴�   <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
 <!--						    <li class="el-icon-caret-bottom" style="color: #409eff">-->
 						</span>
@@ -215,11 +214,11 @@
 						<div>
 							
 						</div>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							宸插畨瑁�  <span style="float: right">0</span>
 <!--							<li class="el-icon-caret-bottom" style="color: #f56c6c">-->
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							鏈畨瑁�   <span style="float: right">68</span>
 <!--						    <li class="el-icon-caret-bottom" style="color: #409eff">-->
 						</span>
@@ -241,15 +240,15 @@
 					</div>
 
 					<div style="flex:6;" class="ilblock">
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							鏂藉伐璧勬枡  <span style="float: right">0</span>
 <!--							<li class="el-icon-caret-bottom" style="color: #f56c6c">-->
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							瀹夊叏璧勬枡   <span style="float: right">0</span>
 <!--						    <li class="el-icon-caret-bottom" style="color: #409eff">-->
 						</span>
-						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+						<span style="color:rgba(0,0,0,.87);font-size: 15px;">
 							璐ㄩ噺璧勬枡   <span style="float: right">0</span>
 <!--						    <li class="el-icon-caret-bottom" style="color: #409eff">-->
 						</span>

--
Gitblit v1.9.1