Skip to content
Snippets Groups Projects
Commit d370158c authored by srosse's avatar srosse
Browse files

OO-1068: compress jquery ui css with our plugin css

parent a698b211
No related branches found
No related tags found
No related merge requests found
......@@ -250,6 +250,7 @@
<include>${basedir}/target/jquery/jquery/tagsinput/bootstrap-tagsinput.min.css</include>
<include>${basedir}/target/jquery/jquery/fullcalendar/fullcalendar.min.css</include>
<include>${basedir}/target/jquery/jquery/imagecrop/jquery.imagecrop.min.css</include>
<include>${basedir}/target/jquery/jquery/ui/jquery-ui-1.10.4.custom.min.css</include>
</includes>
</aggregation>
</aggregations>
......
......@@ -100,10 +100,10 @@ function b_start(){
<link type="text/css" href='$r.staticLink("js/jquery/tagsinput/bootstrap-tagsinput.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/jquery/fullcalendar/fullcalendar.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/jquery/imagecrop/jquery.imagecrop.css")' rel="stylesheet" />
<link type="text/css" href='$r.staticLink("js/jquery/ui/jquery-ui-1.10.4.custom.min.css")' rel="stylesheet" />
#else
<link type="text/css" href='$r.staticLink("js/js.plugins.min.css")' rel="stylesheet" />
#end
<link type="text/css" href='$r.staticLink("js/jquery/ui/jquery-ui-1.10.4.custom.min.css")' rel="stylesheet" />
<script type="text/javascript">
/* <![CDATA[ */
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment