From d05c0235d2bbecf26ef8d63078436646b928e03f Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 17 Sep 2013 13:22:33 +0800 Subject: [PATCH] * ajust style of footer and page my/index. --- module/common/model.php | 2 +- module/common/view/footer.html.php | 20 ++++--- module/my/view/index.html.php | 83 ++++++++++++++++-------------- www/theme/default/style.css | 32 +++++++----- 4 files changed, 71 insertions(+), 66 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 0a06dec770..531f2fe7b9 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -536,7 +536,7 @@ class commonModel extends model public static function printQRCodeLink($color = '') { global $lang; - echo html::a(helper::createLink('misc', 'qrCode'), $lang->user->mobileLogin, '', "class='qrCode $color'"); + echo html::a(helper::createLink('misc', 'qrCode'), " " . $lang->user->mobileLogin, '', "class='qrCode $color'"); } /** diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 4ecbe797f3..c503cf11a7 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -6,17 +6,15 @@ - * @package ZenTaoPMS - * @version $Id: index.html.php 1947 2011-06-29 11:58:03Z wwccss $ - */ -?> - - - -version);?> - - - - - -
-
- -
- - - - user->role and strpos('qa|qd', $app->user->role) !== false):?> - - - user->role and strpos('po|pd', $app->user->role) !== false):?> - - - - - - - -
- + + * @package ZenTaoPMS + * @version $Id: index.html.php 1947 2011-06-29 11:58:03Z wwccss $ + */ +?> + + + +version);?> +
+ + + + + +
+
+ +
+ + + + user->role and strpos('qa|qd', $app->user->role) !== false):?> + + + user->role and strpos('po|pd', $app->user->role) !== false):?> + + + + + + + +
+ +
+ diff --git a/www/theme/default/style.css b/www/theme/default/style.css index c80243a593..48f44cba6b 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -22,8 +22,8 @@ a {text-decoration:none;} /*-----------------------LAYOUT SETTING ----------------------------*/ #wrap{ padding:0 19px; background:#e5e5e5;} -.outer {text-align:left; background:#fff; padding: 20px;} -#wrap .outer {border:1px solid #cfcfcf;-webkit-box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);} +#wrap .outer {text-align:left; background:#fff;border:1px solid #cfcfcf;-webkit-box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);} +.wrapper{padding: 20px;} .cont, .cont-lt1, .cont-lt2, .cont-lt3, .cont-lt4, .cont-lt5, .cont-rt1, .cont-rt2, .cont-rt3, .cont-rt4, .cont-rt5 {width:100%; margin:0; border:none; text-align:left} .cont tr, .cont td {border:none; padding:0} .cont-lt1 tr, .cont-lt2 tr, .cont-lt3 tr, .cont-lt4 tr, .cont-lt5 tr {border:none; padding:0} @@ -120,8 +120,10 @@ a {text-decoration:none;} .button-d{color:blue; font-size:14px; cursor:pointer} /*-----------------------TABLE SETTING----------------------------*/ -table {border:1px solid #e4e4e4;} +table {border:1px solid #d2d2d2;border-collapse: collapse;border-spacing: 0;} td, tr, th {border:none;} +td,th{padding: 8px; line-height: 1.428571429;vertical-align: top;} +th{vertical-align: middle;} tfoot {border-top:1px solid #e4e4e4} tfoot .f-left{ color:gray} tfoot .f-left strong{ color:#141414} @@ -137,12 +139,13 @@ caption {border:1px solid #e4e4e4; background:#edf3fe; margin:0; padding:6px .table-5 {width:600px;margin-bottom:10px} .table-6 {width:800px;margin-bottom:10px} -.table-1 tr, .table-2 tr, .table-3 tr, .table-4 tr, .table-5 tr {padding:4px 3px} -.table-1 td, .table-2 td, .table-3 td, .table-4 td, .table-5 td {padding:4px 3px} -.table-1 th, .table-2 th, .table-3 th, .table-4 th, .table-5 th {padding:4px 3px} +/*.table-1 tr, .table-2 tr, .table-3 tr, .table-4 tr, .table-5 tr {padding:4px 3px}*/ +.table-1 td, .table-2 td, .table-3 td, .table-4 td, .table-5 td {padding:8px} +.table-1 th, .table-2 th, .table-3 th, .table-4 th, .table-5 th {padding:8px} +.side table td,.side table th{padding: 2px 4px;} .colhead td {text-align:center; background-color:#efefef;} -.colhead th {text-align:center; background-color:#efefef; font-size:12px; font-weight:bold; border-bottom:1px solid #e4e4e4; height:24px;} +.colhead th {text-align:center; background-color:#efefef; font-size:12px; font-weight:bold; border-bottom:1px solid #e4e4e4;} .colhead a {text-decoration:none; display:block;} .colhead th a{color:#333; font-size:12px;} .colhead th a:hover{color:#F30;} @@ -315,7 +318,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #modulemenu li.active>a,#modulemenu li.active>a:hover {color:#21841d; font-weight:bold; } #modulemenu li.right {float:right; font-weight:bold;} #modulemenu li.right>a {font-weight:bold} -#modulemenu #myname {color: #888888;} +#modulemenu #myname {display: inline-block; color: #888888;line-height: 34px;} /* Drop menu. */ #currentItem a, #dropMenu a {cursor:pointer} @@ -339,7 +342,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #projectID {background:#e5e5e5; border:1px solid #e5e5e5} /* Feature bar. */ -#featurebar {height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;} +#featurebar {height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: 0;} #featurebar span {font-size:14px;} #featurebar a {text-decoration:none; display: inline-block;padding: 0px 7px; line-height: 34px;height: 34px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;} #featurebar a:hover {color:#000;background-color: #e5e5e5;} @@ -350,7 +353,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #featurebar .active select {border:2px solid #009900;} #featurebar .active input {border:2px solid #009900;} -#featurebar .dp-choose-date {padding:0px;} +#featurebar .dp-choose-date {display: inline-block; height: 16px;text-indent: -9999em;width: 16px;} /* Querybox */ #querybox{margin: -20px -20px 20px -20px;} @@ -430,10 +433,11 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table .tabs a.current {background:green; color:white} /* Footer. */ -#divider {margin-bottom:49px;} -#footer {width:100%; position:fixed; bottom:0; left:0; margin:0; color:#333; background:#e5e5e5 url(images/main/status_x_bg.gif) repeat-x bottom; height:34px; line-height:34px; padding-top:15px;} -#crumbs {padding:5px 0 5px 10px;} -#poweredby {padding-right:10px} +/*#divider {margin-bottom:49px;}*/ +#footer {position: relative; width:100%;position:fixed; bottom:0; left:0; margin:0; border-top: 1px solid #e1e1e1; background:#eef4fe;height:40px; line-height:40px;-webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);} +#crumbs {float: left;margin-left: 20px;} +#crumbs .icon-angle-right{margin-right: 6px;} +#poweredby {float: right;margin-right: 20px;} /* Debug. */ .debugwin {display:block; width:50px; height:20px; bottom:50px; border-left:10px solid red; position:fixed;}