diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index 4d664917d..590dde0c3 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -31,18 +31,14 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px} .x>.header{border-radius:5px 5px 0 0;padding:10px 15px;zoom:1;border-bottom:1px solid #ddd;background:#f6f6f6;background:-webkit-gradient(linear, left top, left bottom, from(#F6F6F6), to(#F1F1F1));background:-moz-linear-gradient(top,#F6F6F6,#F1F1F1);background:-o-linear-gradient(top,#F6F6F6,#F1F1F1)} .x>.header:after{content:"";display:block;clear:both} .x>.body{zoom:1;padding:0 20px 0 240px} -.x>.body.wide{padding:0 20px 0 60px} .x>.body:after{content:"";display:block;clear:both} .x>.body>.content{width:100%;padding:1px 0 0 0;float:right;margin:0 0 30px -100%} .x>.body>.content>*:first-child{margin-top:0} .x>.body>.gnb{position:relative;left:-240px;float:left;width:220px;margin:0 -220px 0 0;background:#f4f4f4;box-shadow:2px 0 4px #ddd} -.x>.body.wide>.gnb{width:36px;margin:0 -36px 0 0;left:-60px} @media all and (max-width:980px){ -.x>.body, -.x>.body.wide{padding:0} +.x>.body{padding:0} .x>.body>.content{width:auto;padding:1px 10px 0 10px;float:none;margin:0 0 30px 0} -.x>.body>.gnb, -.x>.body.wide>.gnb{float:none;width:auto;margin-right:0;left:0;border-radius:0} +.x>.body>.gnb{float:none;width:auto;margin-right:0;left:0;border-radius:0} } /* Header */ @@ -100,15 +96,12 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px} .x>.body>.gnb>ul>li.open>a{font-weight:bold;color:#fff;text-shadow:0 -1px 0 #333;background:#94a55c;background:-webkit-gradient(linear,left top,left bottom,from(#b3d155),to(#94a55c));background:-moz-linear-gradient(top,#b3d155,#94a55c);background:-o-linear-gradient(top,#b3d155,#94a55c)} .x>.body>.gnb>ul>li.active>a{font-weight:bold;color:#fff;text-shadow:none;background:#222;background:-webkit-gradient(linear,left top,left bottom,from(#555),to(#222));background:-moz-linear-gradient(top,#555,#222);background:-o-linear-gradient(top,#555,#222)} /* li>a>span */ -.x>.body.wide>.gnb>ul>li>a>.tx{display:inline-block;width:1px;height:1px;overflow:hidden} .x>.body>.gnb>ul>li>a>.closeAll, -.x>.body.wide>.gnb>ul>li.open>a>.closeAll, .x>.body>.gnb>ul>li.open>a>.openAll{display:none} .x>.body>.gnb>ul>li.open>a>.closeAll{display:inline} /* li>ul */ .x>.body>.gnb>ul>li>ul{display:none;margin:0 10px 10px 10px;border-radius:4px} .x>.body>.gnb>ul>li.open>ul{display:block} -.x>.body.wide>.gnb>ul>li.open>ul{display:none} /* li>ul>li */ .x>.body>.gnb>ul>li>ul>li{border-top:1px solid #ddd;position:relative} .x>.body>.gnb>ul>li>ul>li:first-child{border:0} @@ -123,9 +116,6 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px} /* li>ul>li>.action */ .x>.body>.gnb>ul>li>ul>li>.remove{position:absolute;top:4px;right:5px} .x>.body>.gnb>ul>li>ul>li>.remove>.x_close{width:20px} -@media all and (max-width:980px){ -.x>.body.wide>.gnb>ul>li>a>.tx{width:auto;height:auto} -} /* Dashboard */ .x .dashboard{zoom:1} .x .dashboard:after{content:"";display:block;clear:both} diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js index 7642cfbd6..fcb85044a 100644 --- a/modules/admin/tpl/js/admin.min.js +++ b/modules/admin/tpl/js/admin.min.js @@ -23,29 +23,20 @@ jQuery(function($){ } else { // Less than 1024 $xGnb.height('auto'); } - if($(window).width() < 980 || $(window).width() > 1240){ - $xBody.removeClass('wide'); - } }, 100); }).resize(); - // Trigger for GNB height resize - $($xBody, $xContent, $xGnb).bind('click mouseover mouseout focus blur', function(){ - $(window).resize(); - }); // GNB Click toggle // Add virtual class $xGnb_li.find('>ul').prev('a').addClass('virtual'); // Virtual click $xGnb_li.find('>a.virtual') - .bind('click focus', function(event){ + .bind('click focus', function(){ var $this = $(this); // Submenu toggle if(!$xGnb.hasClass('all')) { $xGnb_li.not($this.parent('li')).removeClass('open'); $(this).parent('li').toggleClass('open'); } - // GNB Hover - $xGnb.trigger('mouseenter'); return false; }); // Toggle all @@ -58,39 +49,5 @@ jQuery(function($){ $xGnb_li.removeClass('open'); $xGnb.removeClass('all'); } - }) - .focus(function(){ - // GNB Hover - $xGnb.trigger('mouseenter'); }); -// GNB Hover toggle - function contentBugFix(){ // Chrome browser rendering bug fix - $xContent.width('99.99%'); - setTimeout(function(){ - $xContent.removeAttr('style'); - }, 0); - } - $xGnb - .mouseenter(function(){ // Mouseenter - if($(window).width() >= 980){ - setTimeout(function(){ - $xBody.removeClass('wide'); - contentBugFix(); - }, 200); - } - }) - .mouseleave(function(){ // Mouseleave - if($(window).width() >= 980 && $(window).width() < 1240){ - $xBody.addClass('wide'); - contentBugFix(); - } - }); -// GNB Close - $xGnb - .prepend('