From 8a3aab617130ae41ef4f968c1c3859dadcb7b8f9 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 10:50:07 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/css/common.css | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/css/common.css b/gx_tieta/WebRoot/pages/css/common.css
index 69b60f3..8744e79 100644
--- a/gx_tieta/WebRoot/pages/css/common.css
+++ b/gx_tieta/WebRoot/pages/css/common.css
@@ -56,8 +56,6 @@
/* absolute 椤堕儴 灞呬腑 搴曢儴瀹氫綅*/
.abs {
position: absolute;
- left: 0;
- right: 0;
z-index: 1;
}
.abs-top {
@@ -70,10 +68,30 @@
bottom: 0;
margin: auto;
}
-
+.abs-left {
+ top:0;
+ bottom: 0;
+ left: 0;
+}
+.abs-right {
+ top:0;
+ bottom: 0;
+ right: 0;
+}
.abs-bottom {
bottom: 0;
margin: 0 auto;
+}
+.left360 {
+ left: 360px;
+}
+
+.abs-top0{
+ top: 0 !important;;
+}
+
+.abs-bottom0{
+ bottom: 0 !important;
}
/* float */
.fix-left {
@@ -727,29 +745,68 @@
background-image: linear-gradient(#3072b3, #599bdc);
}
/* page layui */
-#main {
- position: absolute;
- top: 124px;
- bottom: 32px;
-}
-.whyc-page-content-tbl {
- display: table;
- width: 100%;
- height: 100%;
-}
-.whyc-page-content-tbl-cell {
- display: table-cell;
- height: 100%;
+.whyc-page-content-layui {
position: relative;
-}
-
-.tbl-cell-container {
- position: absolute;
width: 100%;
- top: 0;
- bottom: 0;
+ height: 100%;
}
-
.side-bar-container {
height: 100%;
+}
+
+.whyc-page-layui-header {
+ height: 80px;
+ background-color: #F03AF6;
+}
+.whyc-page-layui-nav {
+ height: 40px;
+ background-color: #4BF50F;
+}
+.whyc-page-layui-main {
+ position: absolute;
+ top: 120px;
+ bottom: 30px;
+ left: 0;
+ right: 0;
+ overflow: hidden;
+ background-color: #7E7878;
+}
+.whyc-page-layui-content-container {
+ position: relative;
+ height: 100%;
+ background-color: #FFFFFF;
+}
+.whyc-page-layui-siderbar {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ background-color: #C3BEBE;
+}
+
+.whyc-page-layui-content {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ overflow: hidden;
+ overflow-y: auto;
+}
+.whyc-page-filter {
+ background-color: #FFFFFF;
+ overflow:hidden;
+}
+.tbl-container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ background-color: #FFFFFF;
+}
+.tbl-filter {
+ position: absolute;
+ top: 4px;
+ left: 0;
+ z-index: 891;
+ padding-left: 10px;
}
\ No newline at end of file
--
Gitblit v1.9.1