RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert old timeplotz dependency.

Browse source 
Rows alignment for Chrome.
This commit is contained in:
Vova Perebykivskyi 2016-11-21 14:26:28 +02:00
parent 321d5cf567
commit 495d29768d
4 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libreplan-webapp/pom.xml
View file

@ -354,11 +354,6 @@
<artifactId>zk</artifactId>
</dependency>
<dependency>
<groupId>org.zkoss.common</groupId>
<artifactId>zcommon</artifactId>
</dependency>
<!-- LibrePlan ZK Components -->
<dependency>
<groupId>org.libreplan</groupId>

4
libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
View file

@ -1014,10 +1014,6 @@ span.z-dottree-line {
height: 35px;
}
.taskdetail-company-view .clickable-rows {
margin-left: 5px;
}
.z-button.perspective,
.z-button.perspective-active {
padding-top: 60px;

20
libreplan-webapp/src/main/webapp/planner/css/ganttzk.css
View file

@ -122,9 +122,13 @@
padding-left: 4px;
}
.taskdetail-company-view .z-tree-ico {
.taskdetail-company-view .z-tree-line {
display:none;
}
/* Order name will be in single row */
.taskdetail-company-view .z-label {
white-space: nowrap;
}
.order-startdate, .order-enddate {
@ -157,7 +161,15 @@
.row {
height: 12px;
border-bottom: dotted 1px #CCCCCC;
margin-bottom: 10px;
margin-bottom: 9px;
margin-top: 9px;
width: 100%;
}
.parentProjectScheduling .row {
height: 12px;
border-bottom: dotted 1px #CCCCCC;
margin-bottom: 12px;
margin-top: 10px;
width: 100%;
}
@ -607,7 +619,7 @@ tr.z-vbox-separator {
height: 10px;
border: 1px;
width: 100%;
margin-bottom: 12px;
margin-bottom: 10px;
margin-top: 10px;
border-bottom: 1px dotted #CCCCCC;
}
@ -778,7 +790,7 @@ tr.z-vbox-separator {
}
.limitingresources-list .row_resourceload {
height: 24px;
height: 25px;
}
.limiting-resources .z-tree-line {

21
pom.xml
View file

@ -166,12 +166,6 @@
<id>thirdparty</id>
<url>http://nexus.libreplan.org/nexus/content/repositories/thirdparty-libreplan16/</url>
</repository>
<!-- ZK CE repository -->
<repository>
<id>ZK CE</id>
<url>http://mavensync.zkoss.org/maven2/</url>
</repository>
</repositories>
<!-- Dependency management -->
@ -469,19 +463,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.zkoss.common</groupId>
<artifactId>zcommon</artifactId>
<version>8.0.1.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JGraphT -->
<dependency>
<groupId>org.jgrapht</groupId>
@ -605,7 +586,7 @@
<dependency>
<groupId>org.zkoss.zkforge</groupId>
<artifactId>timeplotz</artifactId>
<version>1.1_50</version>
<version>1.1_50_1</version>
</dependency>
<dependency>