调整LOGO样式，为即将添加的图片LOGO做准备

joode · Nov 8, 2021 · 27d89ae · 27d89ae
1 parent 6613177
commit 27d89ae
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/datagear-web/src/main/resources/org/datagear/web/static/css/style.css b/datagear-web/src/main/resources/org/datagear/web/static/css/style.css
@@ -1150,10 +1150,19 @@ table.dataTable tbody tr td select{
 	margin-top: 0.1em;
 }
 .main-page-head .logo .logo-content{
-	font-size: small;
-	font-weight: bold;
-	opacity: 0.7;
-	filter: Alpha(Opacity=70);
+	display: inline-block;
+	opacity: 1;
+	filter: Alpha(Opacity=100);
+    width: 84px;
+    height: 20px;
+    background-size: 100% 100%;
+    font-weight: bold;
+    font-size: 0.9em;
+    /*text-indent: -100px;*/
+}
+.main-page-head .logo .logo-content:hover{
+	opacity: 0.9;
+	filter: Alpha(Opacity=90);
 }
 .main-page-head .toolbar{
 	float: right;

diff --git a/datagear-web/src/main/resources/org/datagear/web/static/theme/dark/style.css b/datagear-web/src/main/resources/org/datagear/web/static/theme/dark/style.css
@@ -299,4 +299,9 @@ table.dataTable th,
 	color: #ffffff !important;
 	border: 1px solid #59b4d4 !important;
     background: #0078a3 !important;
+}
+
+/*LOGO*/
+.main-page-head .logo .logo-content{
+	background-image: url(../../img/logo/full-210x50/logo-red-white.png);
 }
diff --git a/datagear-web/src/main/resources/org/datagear/web/static/theme/green/style.css b/datagear-web/src/main/resources/org/datagear/web/static/theme/green/style.css
@@ -299,4 +299,9 @@ table.dataTable th,
 	color: #ffffff !important;
 	border: 1px solid #6cc510 !important;
     background: #459e05 !important;
+}
+
+/*LOGO*/
+.main-page-head .logo .logo-content{
+	background-image: url(../../img/logo/full-210x50/logo-red-white.png);
 }
diff --git a/datagear-web/src/main/resources/org/datagear/web/static/theme/light/style.css b/datagear-web/src/main/resources/org/datagear/web/static/theme/light/style.css
@@ -299,4 +299,9 @@ table.dataTable th,
 	color: #2b2b2b !important;
 	border: 1px solid #cccccc !important;
     background: #ededed !important;
+}
+
+/*LOGO*/
+.main-page-head .logo .logo-content{
+	background-image: url(../../img/logo/full-210x50/logo-red.png);
 }
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/include/html_head.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/include/html_head.ftl
@@ -6,9 +6,10 @@
  * http://www.gnu.org/licenses/lgpl-3.0.html
  *
 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="description" content="DataGear是一款数据可视化分析平台，使用Java语言开发，采用浏览器/服务器架构，支持SQL、CSV、Excel、HTTP接口、JSON等多种数据源，主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。" />
 <meta name="keywords" content="DataGear, 数据可视化, data visualization, 数据分析, data analysis, 商业智能, BI, 图表, chart, 看板, dashboard" />
+<link rel="shortcut icon" href="${contextPath}/static/img/logo/icon-80x80/logo-red.png" />
 <#if !isAjaxRequest>
 <#assign _hh_Version=statics['org.datagear.util.Global'].VERSION>
 <script type="text/javascript">

diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/include/html_logo.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/include/html_logo.ftl
@@ -7,7 +7,9 @@
  *
 -->
 <div class="logo">
-	<div class="logo-content">
-		<a href="${statics['org.datagear.util.Global'].WEB_SITE}" target="_blank" class="link"><@spring.message code="app.name" /></a>
-	</div>
+	<a href="${statics['org.datagear.util.Global'].WEB_SITE}" target="_blank" class="link">
+		<span class="logo-content">
+			<@spring.message code="app.name" />
+		</span>
+	</a>
 </div>