mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 11:11:39 +09:00
Issue 2442 minor fix.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11220 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
293ccb13af
commit
db0aa266bc
7 changed files with 17 additions and 17 deletions
|
|
@ -37,7 +37,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.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:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x>.body,
|
||||
.x>.body.wide{padding:0}
|
||||
.x>.body>.content{width:auto;padding:1px 10px 0 10px;float:none;margin:0 0 30px 0}
|
||||
|
|
@ -123,7 +123,7 @@ 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:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x>.body.wide>.gnb>ul>li>a>.tx{width:auto;height:auto}
|
||||
}
|
||||
/* Dashboard */
|
||||
|
|
@ -147,7 +147,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x .dashboard>section li>.side{position:absolute;top:0;right:5px;line-height:28px;width:60px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right;zoom:1}
|
||||
.x .dashboard>section li>.action{display:none;position:absolute;top:0;right:5px;margin:0;padding:0 0 0 10px;text-align:right;white-space:nowrap;line-height:28px;background:#f4f4f4}
|
||||
.x .dashboard>section li>.action>button{margin:0 0 0 4px;padding:0;overflow:visible}
|
||||
@media all and (max-width:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x .dashboard>section:nth-child(odd),
|
||||
.x .dashboard>section:nth-child(even){float:none;width:auto}
|
||||
}
|
||||
|
|
|
|||
6
modules/admin/tpl/css/admin.min.css
vendored
6
modules/admin/tpl/css/admin.min.css
vendored
|
|
@ -37,7 +37,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.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:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x>.body,
|
||||
.x>.body.wide{padding:0}
|
||||
.x>.body>.content{width:auto;padding:1px 10px 0 10px;float:none;margin:0 0 30px 0}
|
||||
|
|
@ -123,7 +123,7 @@ 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:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x>.body.wide>.gnb>ul>li>a>.tx{width:auto;height:auto}
|
||||
}
|
||||
/* Dashboard */
|
||||
|
|
@ -147,7 +147,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x .dashboard>section li>.side{position:absolute;top:0;right:5px;line-height:28px;width:60px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right;zoom:1}
|
||||
.x .dashboard>section li>.action{display:none;position:absolute;top:0;right:5px;margin:0;padding:0 0 0 10px;text-align:right;white-space:nowrap;line-height:28px;background:#f4f4f4}
|
||||
.x .dashboard>section li>.action>button{margin:0 0 0 4px;padding:0;overflow:visible}
|
||||
@media all and (max-width:1023px){
|
||||
@media all and (max-width:980px){
|
||||
.x .dashboard>section:nth-child(odd),
|
||||
.x .dashboard>section:nth-child(even){float:none;width:auto}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
@charset "utf-8";
|
||||
@font-face{font-family:NG;src:url(../../../../common/font/NanumGothic.eot);src:local(※),url(../../../../common/font/NanumGothic.woff) format('woff')}
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
@media all and (max-width:1024px){
|
||||
@media all and (max-width:980px){
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
@charset "utf-8";
|
||||
@font-face{font-family:NG;src:url(../../../../common/font/NanumGothic.eot);src:local(※),url(../../../../common/font/NanumGothic.woff) format('woff')}
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
@media all and (max-width:1024px){
|
||||
@media all and (max-width:980px){
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
@charset "utf-8";
|
||||
@font-face{font-family:NG;src:url(../../../../common/font/NanumGothic.eot);src:local(※),url(../../../../common/font/NanumGothic.woff) format('woff')}
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
@media all and (max-width:1024px){
|
||||
@media all and (max-width:980px){
|
||||
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
}
|
||||
|
|
@ -18,12 +18,12 @@ jQuery(function($){
|
|||
var $xGnb_li = $xGnb.find('>ul>li');
|
||||
$(window).resize(function(){
|
||||
setTimeout(function(){
|
||||
if($(window).width() >= 1024){ // Over than 1024px
|
||||
if($(window).width() >= 980){ // Over than 1024px
|
||||
$xGnb.height('auto').height($xBody.height());
|
||||
} else { // Less than 1024
|
||||
$xGnb.height('auto');
|
||||
}
|
||||
if($(window).width() < 1024 || $(window).width() > 1260){
|
||||
if($(window).width() < 980 || $(window).width() > 1240){
|
||||
$xBody.removeClass('wide');
|
||||
}
|
||||
}, 100);
|
||||
|
|
@ -72,7 +72,7 @@ jQuery(function($){
|
|||
}
|
||||
$xGnb
|
||||
.mouseenter(function(){ // Mouseenter
|
||||
if($(window).width() >= 1024){
|
||||
if($(window).width() >= 980){
|
||||
setTimeout(function(){
|
||||
$xBody.removeClass('wide');
|
||||
contentBugFix();
|
||||
|
|
@ -80,7 +80,7 @@ jQuery(function($){
|
|||
}
|
||||
})
|
||||
.mouseleave(function(){ // Mouseleave
|
||||
if($(window).width() >= 1024 && $(window).width() < 1260){
|
||||
if($(window).width() >= 980 && $(window).width() < 1240){
|
||||
$xBody.addClass('wide');
|
||||
contentBugFix();
|
||||
}
|
||||
|
|
|
|||
8
modules/admin/tpl/js/admin.min.js
vendored
8
modules/admin/tpl/js/admin.min.js
vendored
|
|
@ -18,12 +18,12 @@ jQuery(function($){
|
|||
var $xGnb_li = $xGnb.find('>ul>li');
|
||||
$(window).resize(function(){
|
||||
setTimeout(function(){
|
||||
if($(window).width() >= 1024){ // Over than 1024px
|
||||
if($(window).width() >= 980){ // Over than 1024px
|
||||
$xGnb.height('auto').height($xBody.height());
|
||||
} else { // Less than 1024
|
||||
$xGnb.height('auto');
|
||||
}
|
||||
if($(window).width() < 1024 || $(window).width() > 1260){
|
||||
if($(window).width() < 980 || $(window).width() > 1240){
|
||||
$xBody.removeClass('wide');
|
||||
}
|
||||
}, 100);
|
||||
|
|
@ -72,7 +72,7 @@ jQuery(function($){
|
|||
}
|
||||
$xGnb
|
||||
.mouseenter(function(){ // Mouseenter
|
||||
if($(window).width() >= 1024){
|
||||
if($(window).width() >= 980){
|
||||
setTimeout(function(){
|
||||
$xBody.removeClass('wide');
|
||||
contentBugFix();
|
||||
|
|
@ -80,7 +80,7 @@ jQuery(function($){
|
|||
}
|
||||
})
|
||||
.mouseleave(function(){ // Mouseleave
|
||||
if($(window).width() >= 1024 && $(window).width() < 1260){
|
||||
if($(window).width() >= 980 && $(window).width() < 1240){
|
||||
$xBody.addClass('wide');
|
||||
contentBugFix();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue