From 31115786284989adac109e2b04e65fb4dd505402 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Mon, 10 Dec 2012 05:48:22 +0000 Subject: [PATCH] Default layout bug fix. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12361 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/css/xe.css | 1 + common/css/xe.min.css | 2 +- common/js/xml_handler.js | 10 +++---- layouts/bootstrap.layout/bootstrap.layout.css | 7 ++--- layouts/bootstrap.layout/layout.html | 26 +++++++++---------- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/common/css/xe.css b/common/css/xe.css index c7c7cfe03..61dd5d190 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -2,6 +2,7 @@ /* NHN (developers@xpressengine.com) */ /* Element Reset */ body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display: block} body{word-wrap:break-word} a img{border:0} [hidden], diff --git a/common/css/xe.min.css b/common/css/xe.min.css index ad19ba1a7..6cf953628 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:13px}body{word-wrap:break-word}a img{border:0}[hidden],[hidden][id],[hidden][class]{display:none}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.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;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:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;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;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;bottom:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 90px;text-align:center;margin:0;padding:120px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px "Helvetica Neue",Helvetica,Arial,돋움,Dotum,sans-serif}#adminBar{position:absolute;left:0;top:0;background:#000;width:100%;opacity:.5;filter:alpha(opacity=50);z-index:100;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden}#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>p{margin:0}#adminBar>.admin{float:left}#adminBar>.link{float:right;padding:0 10px 0 0}#adminBar a{color:#fff;text-decoration:none}#adminBar a:hover,#adminBar a:active,#adminBar a:focus{text-decoration:underline} \ No newline at end of file +@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display: block}body{word-wrap:break-word}a img{border:0}[hidden],[hidden][id],[hidden][class]{display:none}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.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;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:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;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;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;bottom:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 90px;text-align:center;margin:0;padding:120px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px "Helvetica Neue",Helvetica,Arial,돋움,Dotum,sans-serif}#adminBar{position:absolute;left:0;top:0;background:#000;width:100%;opacity:.5;filter:alpha(opacity=50);z-index:100;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden}#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>p{margin:0}#adminBar>.admin{float:left}#adminBar>.link{float:right;padding:0 10px 0 0}#adminBar a{color:#fff;text-decoration:none}#adminBar a:hover,#adminBar a:active,#adminBar a:focus{text-decoration:underline} \ No newline at end of file diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index 8869a250f..d7b970fdf 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -371,11 +371,11 @@ $.exec_json = function(action,data,func){ ,success : function(data){ $(".wfsr").hide().trigger('cancel_confirm'); if(data.error > 0) alert(data.message); - if(data.error == -1 && data.message == 'msg_is_not_administrator'){ - alert('You are not logged in as an administrator'); - window.location.reload(); - return; - } +// if(data.error == -1 && data.message == 'msg_is_not_administrator'){ +// alert('You are not logged in as an administrator'); +// window.location.reload(); +// return; +// } if($.isFunction(func)) func(data); } }); diff --git a/layouts/bootstrap.layout/bootstrap.layout.css b/layouts/bootstrap.layout/bootstrap.layout.css index e6e5cb332..082184256 100644 --- a/layouts/bootstrap.layout/bootstrap.layout.css +++ b/layouts/bootstrap.layout/bootstrap.layout.css @@ -25,10 +25,11 @@ input[type=radio]{margin:0} .header{position:relative;z-index:2;margin:15px 0} .body{position:relative;z-index:1;margin:15px 0;zoom:1} .body:after{content:"";display:block;clear:both} +.body.sub>.lnb{display:none} @media all and (min-width:980px){ .body.sub{padding-left:220px} -.body.sub>.content{width:100%;clear:both} -.body.sub>.lnb{float:left;width:200px;position:relative;left:-220px} +.body.sub>.content{float:right;width:100%} +.body.sub>.lnb{display:block;float:left;width:200px;position:relative;left:-220px;margin-right:-200px} } .content{outline:0} .footer{margin:15px 0} @@ -59,7 +60,7 @@ input[type=radio]{margin:0} .account{position:absolute;right:0;bottom:5px;z-index:2;margin:0} /* Visual */ .visual{display:block;position:relative;width:100%;overflow:hidden;margin:0 0 20px 0;border-radius:5px;overflow:hidden} -.body.sub>.visual{float:right;margin-left:-100%} +.body.sub>.visual{float:right} .visual>.list{position:relative;z-index:1;width:100%;zoom:1} .visual>.list.count1{width:100%;left:0} .visual>.list.count2{width:200%;left:0} diff --git a/layouts/bootstrap.layout/layout.html b/layouts/bootstrap.layout/layout.html index 952440cc0..92e204bdd 100644 --- a/layouts/bootstrap.layout/layout.html +++ b/layouts/bootstrap.layout/layout.html @@ -49,6 +49,19 @@
+ + +
@@ -92,19 +105,6 @@
- - -
{$content}