merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -2,7 +2,7 @@
<load target="css/default.css" cond="$layout_info->colorset=='default' || !$layout_info->colorset" />
<load target="css/white.css" cond="$layout_info->colorset=='white'" />
<load target="css/black.css" cond="$layout_info->colorset=='black'" />
<style type="text/css" cond="$layout_info->background_image">
<style cond="$layout_info->background_image">
body{background:url({$layout_info->background_image}) repeat-x left top;}
</style>
<!--@if(!$layout_info->colorset)-->{@$layout_info->colorset = "default"}<!--@end-->