From c2645caf8af0529a37e4efa2cbce0bbf2cdeed17 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Mon, 23 Apr 2012 09:21:53 +0000 Subject: [PATCH] issue 1849 fix. Thanks to vn21.net. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10598 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/css/xe.css | 2 +- common/css/xe.min.css | 2 +- modules/editor/styles/default/editor.css | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/css/xe.css b/common/css/xe.css index df8399bcd..eda087d6c 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -3,7 +3,7 @@ /* Element Reset */ body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px} body{word-break:break-all;word-wrap:break-word} -img{border:0;max-width:100%;height:auto} +.xe_content img{border:0;max-width:100%;width:auto;height:auto} /* Button Area */ .btnArea{margin:1em 0;text-align:right;zoom:1;clear:both} .btnArea:after{content:"";display:block;clear:both} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index 527219387..03b509635 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -1 +1 @@ -@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}body{word-break:break-all;word-wrap:break-word}img{border:0;max-width:100%;height:auto}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../common/img/msg.update.png) no-repeat 1em .5em}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file +@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}body{word-break:break-all;word-wrap:break-word}.xe_content img{border:0;max-width:100%;width:auto;height:auto}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../common/img/msg.update.png) no-repeat 1em .5em}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1} \ No newline at end of file diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css index cca1a001d..059364e94 100644 --- a/modules/editor/styles/default/editor.css +++ b/modules/editor/styles/default/editor.css @@ -1,8 +1,9 @@ @charset "utf-8"; +/* NHN (developers@xpressengine.com) */ html,body{height:100%} body{margin:0;padding:0} -/* NHN (developers@xpressengine.com) */ .xe_content{color:#000;font-size:12px;line-height:1.5;word-break:break-all;word-wrap:break-word} +.xe_content img{border:0;max-width:100%;width:auto;height:auto} .xe_content blockquote.q1, .xe_content blockquote.q2, .xe_content blockquote.q3, @@ -18,4 +19,4 @@ body{margin:0;padding:0} .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 p{margin:0} +.xe_content p{margin:0} \ No newline at end of file