Merge branch 'master' of github.com:easysoft/zentaopms

Conflicts: module/project/css/task.css
2016-11-28 09:11:57 +08:00
parent be29473333 ec4804aff9
commit f3aef78223
41 changed files with 528 additions and 473 deletions
@@ -1,3 +1,5 @@
+.red{color:red;}
+
 .bug, .task {color:gray; font-size:9px}
 .cont-lt1 .side{width:220px}
 #sidebar{position:absolute;left:15px;top:185px;width:20px;height:20px;cursor:pointer;background:url(theme/default/images/main/zt-icons.png) -81px  -161px;}
@@ -19,4 +21,7 @@

 .pl-5px{padding-left:5px;}

+#taskTree{position:fixed;margin-left:20px;}
+.outer.hide-side #taskTree{margin-left:0px;}
+
 tbody > tr > td > .btn-icon {margin-right: 2px}