From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/pages/css/mylayui.css |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index cbbb889..0a9ac54 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -3,7 +3,6 @@
 	height: 100%;
 	min-width: 1200px;
 	overflow: hidden;
-	overflow-x: auto;
 }
 .layui-table-view {
 	margin: 0;
@@ -169,4 +168,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