From f7f9c854c5b662aadceca474cb0958407cda098d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 10:45:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 1 +
gx_tieta/WebRoot/pages/css/mylayui.css | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 190b60c..7e91207 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,6 +25,7 @@
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
+ <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/base.js"></script>
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index cbbb889..9729825 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -169,4 +169,8 @@
.graph-content {
width: 100%;
height: 100%;
+}
+/* my layui */
+.popup .layui-card-body {
+ padding: 0;
}
\ No newline at end of file
--
Gitblit v1.9.1