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

@ -1,6 +1,3 @@
@charset "utf-8";
/* NHN (developers@xpressengine.com) */
html, body { height:100%; background-color:transparent; padding:0; margin:0;}
body{ margin:1em;}
.xe_content{ color:#000; font-size:12px; line-height:1.5;}
html,body{height:100%;background-color:transparent}
body{margin:1em;color:#000;font-size:12px;line-height:1.5}