From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/css/control_style.css |   49 -------------------------------------------------
 1 files changed, 0 insertions(+), 49 deletions(-)

diff --git a/gx_tieta/WebRoot/css/control_style.css b/gx_tieta/WebRoot/css/control_style.css
index 262e1f4..34cc5ee 100644
--- a/gx_tieta/WebRoot/css/control_style.css
+++ b/gx_tieta/WebRoot/css/control_style.css
@@ -55,56 +55,7 @@
 	width: 100%;
 	height:460px;
 	background: white;
-	overflow:scroll;
 	position: relative;
-}
-#lside>ul{
-	width: 100%;
-	position:absolute;
-	margin-bottom: 30px;
-}
-#lside>ul>li>a{
-	display:block;
-	color:black;
-	font-size: 16px;
-	padding:12px 5px;
-	white-space: nowrap;
-}
-#lside>ul>li>ul{
-	display:none;
-	}
-#lside>ul>li>ul>li>a{
-	display:block;
-	font-size: 14px;
-	padding:10px 20px;
-	white-space: nowrap;
-}
-#lside>ul>li>ul>li>ul{
-	display:none;
-}
-#lside>ul>li>ul>li>ul>li>a{
-	display:block;
-	font-size: 12px;
-	padding:10px 10px 10px 40px;
-	white-space: nowrap;
-}
-#lside li.list-error a{
-	color: #FF0000 !important;
-}
-#lside li.list-pink a{
-	color: #f023df !important;
-}
-#lside li.list-blue a{
-	color: #0000ff !important;
-}
-#lside li.list-lightBlue a{
-	color: #5a5af3 !important;
-}
-#lside li.list-green a{
-	color: #008000 !important;
-}
-#lside li.list-lightGreen a{
-	color: #857d18 !important;
 }
 /* 鐢垫睜鍏呮斁鐢电洃娴嬫ā鍧� */
 #ele_content .batt-listen {

--
Gitblit v1.9.1