From 82c0e01ab038fa3119208b8bf1fba2e46404c262 Mon Sep 17 00:00:00 2001
From: ansel0926 <ansel0926@gmail.com>
Date: 星期六, 14 五月 2022 21:48:06 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
---
assets/css/iconfont.ttf | 0
assets/images/login/logo2.png | 0
view/index.html | 7 ++++---
assets/css/iconfont.css | 17 +++++++++++++++++
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/assets/css/iconfont.css b/assets/css/iconfont.css
new file mode 100644
index 0000000..c209f89
--- /dev/null
+++ b/assets/css/iconfont.css
@@ -0,0 +1,17 @@
+@font-face {
+ font-family: "iconfont"; /* Project id */
+ src: url('iconfont.ttf?t=1652518912556') format('truetype');
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-lianjie:before {
+ content: "\e613";
+}
+
diff --git a/assets/css/iconfont.ttf b/assets/css/iconfont.ttf
new file mode 100644
index 0000000..1659f6e
--- /dev/null
+++ b/assets/css/iconfont.ttf
Binary files differ
diff --git a/assets/images/login/logo2.png b/assets/images/login/logo2.png
new file mode 100644
index 0000000..8167e9d
--- /dev/null
+++ b/assets/images/login/logo2.png
Binary files differ
diff --git a/view/index.html b/view/index.html
index 45260cc..dead26f 100644
--- a/view/index.html
+++ b/view/index.html
@@ -16,6 +16,7 @@
<link href="../libs/Cesium1.75/dist/cesium-navigation.css" rel="stylesheet">
<link rel="stylesheet" href="//at.alicdn.com/t/font_2599272_671fgrsk7ev.css">
+ <link rel="stylesheet" href="../assets/css/iconfont.css">
<script type="text/javascript" src="../libs/jquery/jquery-3.5.1.min.js"></script>
@@ -110,7 +111,7 @@
<!--logo-->
<div id="logo" class="logo">
<div class="logo-name">
- <!-- <img src="../assets/images/login/logo.png" style="margin-top: -5px;width: 56px;" /> -->
+ <img src="../assets/images/login/logo2.png" style="margin-top: -5px;width: 35px;" />
<span>CUGB DDE 鍘熷瀷绯荤粺</span>
</div>
</div>
@@ -134,11 +135,11 @@
<!--宸︿晶鏍忕洰-->
<div id="left" class="left-item">
- <div title="鍒囨崲搴曞浘" id="baseMap" onclick="baseMap();" class="icon-hover icon-item" style="margin-top: 60px;">
+ <div title="鍒囨崲搴曞浘" id="baseMap" onclick="baseMap();" class="icon-hover icon-item" style="margin-top: 40px;">
<i class="iconfont icon-dituliulan i-item"></i>
</div>
<div title="鍏宠仈椤圭洰" id="relatedProj" onclick="relatedProj();" class="icon-hover icon-item">
- <i class="iconfont icon-lianjie i-item"></i>
+ <i class="iconfont icon-lianjie i-item"></i>
</div>
<div title="缁煎悎婕父" id="characterBtn" onclick="roamControl();" class="icon-hover icon-item">
<i class="iconfont icon-manyou i-item"></i>
--
Gitblit v1.9.1