From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/css/common.css | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/css/common.css b/gx_tieta/WebRoot/css/common.css
index 9df4432..29a0338 100644
--- a/gx_tieta/WebRoot/css/common.css
+++ b/gx_tieta/WebRoot/css/common.css
@@ -35,6 +35,37 @@
overflow: hidden;
overflow-y: auto;
}
+.whyc-sider-menu::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
+}
+.whyc-sider-menu::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ background: #535353;
+}
+.whyc-sider-menu::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ border-radius: 10px;
+ background: #EDEDED;
+}
+
+
+.batt-list::-webkit-scrollbar {/*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 1px;
+}
+.batt-list::-webkit-scrollbar-thumb {/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ background: #535353;
+}
+.batt-list::-webkit-scrollbar-track {/*婊氬姩鏉￠噷闈㈣建閬�*/
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+ border-radius: 10px;
+ background: #EDEDED;
+}
+
/* first */
.whyc-sider-menu>ul>li>a>i.fa {
margin-left: .5em;
@@ -50,6 +81,10 @@
/* fourth */
.whyc-sider-menu>ul>li>ul>li>ul>li>ul>li>a>i.fa {
margin-left: 2em;
+}
+/* end */
+.whyc-sider-menu>ul>li>ul>li>ul>li>ul>li>ul>li>a>i.fa {
+ margin-left: 2.5em;
}
.whyc-sider-menu i.fa {
color: #676863;
@@ -174,7 +209,22 @@
background-color: #FFFFFF;
}
-
+/* hdw-tbl-style */
+.hdw-tbl {
+ width: 100%;
+ border-collapse: collapse;
+}
+.hdw-tbl th, .hdw-tbl td {
+ border: 1px solid #cccccc;
+}
+.hdw-tbl th {
+ font-size: 14px;
+ padding: 4px 10px;
+ background: url('../image/table_th_bg.gif') repeat-x;
+}
+.hdw-tbl td {
+ padding: 4px 0 4px 8px;
+}
/* jquery ui style */
body .ui-front {
--
Gitblit v1.9.1