Commit 01f89706 authored by Christoph Thelen's avatar Christoph Thelen

Minify CSS; copy Touch Charts into resources without minification

parent 5f8a2fa6
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
</fileset> </fileset>
<mapper type="glob" from="*.js" to="*.js.min"/> <mapper type="glob" from="*.js" to="*.js.min"/>
</apply> </apply>
<!-- copy Touch Charts manually -->
<copy todir="${build.dir}/lib/touch-charts-2.0">
<fileset dir="${main.dir}/lib/touch-charts-2.0">
<include name="touch-charts.js"/>
</fileset>
</copy>
</target> </target>
<target name="-min:js:move" depends="-min:js:minify"> <target name="-min:js:move" depends="-min:js:minify">
...@@ -52,9 +58,13 @@ ...@@ -52,9 +58,13 @@
<target name="min:js" depends="-build:init,-assets:copy,-min:js:move" /> <target name="min:js" depends="-build:init,-assets:copy,-min:js:move" />
<target name="min:css"> <target name="min:css" depends="-build:init,-assets:copy">
<java jar="${sencha.dir}/jsbuilder/ycompressor/ycompressor.jar" fork="true" failonerror="true" output="${main.dir}/resources/css/arsnova_min.css"> <java jar="${lib.dir}/stylesheets.jar" fork="true" failonerror="true">
<arg value="${main.dir}/resources/css/arsnova_new.css" /> <arg line="--allowed-non-standard-function color-stop" />
<arg line="--allowed-non-standard-function progid:DXImageTransform.Microsoft.gradient" />
<arg value="--output-file" />
<arg value="${build.dir}/resources/css/st2-arsnova_min.css" />
<arg value="${main.dir}/resources/css/st2-arsnova_new.css" />
</java> </java>
</target> </target>
......
...@@ -63,8 +63,7 @@ ...@@ -63,8 +63,7 @@
<phase>compile</phase> <phase>compile</phase>
<configuration> <configuration>
<target> <target>
<!-- ant target="min:css" /--> <ant target="run" />
<ant target="min:js" />
</target> </target>
</configuration> </configuration>
<goals> <goals>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<link rel="stylesheet" href="lib/touch-2.2.1/resources/css/sencha-touch.css" type="text/css"> <link rel="stylesheet" href="lib/touch-2.2.1/resources/css/sencha-touch.css" type="text/css">
<!-- will be created by jenkins--> <!-- will be created by jenkins-->
<link rel="stylesheet" href="resources/css/st2-arsnova_new.css" type="text/css"> <link rel="stylesheet" href="resources/css/st2-arsnova_min.css" type="text/css">
</head> </head>
<body class="x-fullscreen"> <body class="x-fullscreen">
<script type="text/javascript" src="lib/touch-2.2.1/sencha-touch-all-compat.js"></script> <script type="text/javascript" src="lib/touch-2.2.1/sencha-touch-all-compat.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment