merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -2,7 +2,7 @@
html,body{height:100%}
body{margin:0;padding:0}
/* NHN (developers@xpressengine.com) */
.xe_content{color:#000;font-size:12px;line-height:1.5}
.xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word}
.xe_content blockquote.q1,
.xe_content blockquote.q2,
.xe_content blockquote.q3,
@ -17,5 +17,5 @@ body{margin:0;padding:0}
.xe_content blockquote.q5{border:2px solid #707070}
.xe_content blockquote.q6{border:1px dashed #707070}
.xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
.xe_content table .xe_selected_cell{background-color: #d6e9ff}
.xe_content table .xe_selected_cell{background-color:#d6e9ff}
.xe_content p{margin:0}