mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-20 03:39:56 +09:00
Issue 2444. File upload UI bugfix.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11447 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
9c37dd436a
commit
d1fb60cc36
6 changed files with 30 additions and 26 deletions
|
|
@ -2,7 +2,7 @@
|
|||
/* Reset */
|
||||
html{min-height:100%}
|
||||
body{margin:10px;-webkit-text-size-adjust:none}
|
||||
body>.x{min-width:300px}
|
||||
body>.x{min-width:300px;max-width:1240px}
|
||||
@media all and (max-width:480px){
|
||||
body>.x{margin:0}
|
||||
}
|
||||
|
|
@ -37,6 +37,8 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x a.x_icon-question-sign,
|
||||
.x button.x_icon-question-sign{cursor:help}
|
||||
.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px}
|
||||
.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd}
|
||||
.x .x_table>caption{text-align:left;padding:8px 0}
|
||||
/* Image Sprite */
|
||||
.x a[target="_blank"]:after,
|
||||
.x>.body>.gnb>ul>li>a:before,
|
||||
|
|
@ -76,7 +78,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif}
|
||||
.x>.header>.site>a:hover,
|
||||
.x>.header>.site>a:focus{text-decoration:underline}
|
||||
.x>.header>.account{float:right;position:relative;margin:20px 0 0 0}
|
||||
.x>.header>.account{float:right;position:relative;margin:13px 0 0 0}
|
||||
.x>.header>.account>ul{list-style:none;margin:0;padding:0}
|
||||
.x>.header>.account>ul>li{display:inline}
|
||||
.x>.header>.account>ul>li:before{content:"| ";color:#ddd}
|
||||
|
|
|
|||
6
modules/admin/tpl/css/admin.min.css
vendored
6
modules/admin/tpl/css/admin.min.css
vendored
|
|
@ -2,7 +2,7 @@
|
|||
/* Reset */
|
||||
html{min-height:100%}
|
||||
body{margin:10px;-webkit-text-size-adjust:none}
|
||||
body>.x{min-width:300px}
|
||||
body>.x{min-width:300px;max-width:1240px}
|
||||
@media all and (max-width:480px){
|
||||
body>.x{margin:0}
|
||||
}
|
||||
|
|
@ -37,6 +37,8 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x a.x_icon-question-sign,
|
||||
.x button.x_icon-question-sign{cursor:help}
|
||||
.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px}
|
||||
.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd}
|
||||
.x .x_table>caption{text-align:left;padding:8px 0}
|
||||
/* Image Sprite */
|
||||
.x a[target="_blank"]:after,
|
||||
.x>.body>.gnb>ul>li>a:before,
|
||||
|
|
@ -76,7 +78,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
|
|||
.x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif}
|
||||
.x>.header>.site>a:hover,
|
||||
.x>.header>.site>a:focus{text-decoration:underline}
|
||||
.x>.header>.account{float:right;position:relative;margin:20px 0 0 0}
|
||||
.x>.header>.account{float:right;position:relative;margin:13px 0 0 0}
|
||||
.x>.header>.account>ul{list-style:none;margin:0;padding:0}
|
||||
.x>.header>.account>ul>li{display:inline}
|
||||
.x>.header>.account>ul>li:before{content:"| ";color:#ddd}
|
||||
|
|
|
|||
|
|
@ -24,12 +24,11 @@ jQuery(function($){
|
|||
});
|
||||
*/
|
||||
// Tab Navigation
|
||||
var $tabbable = $('.x .x_tabbable');
|
||||
$tabbable.find('.x_tab-pane:not(".x_active")').hide();
|
||||
$tabbable.find('.x_nav-tabs>li>a').click(function(){
|
||||
$('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
|
||||
$('.x .x_nav-tabs').find('>li>a').click(function(){
|
||||
var $this = $(this);
|
||||
$this.parent('li').addClass('x_active').siblings().removeClass('x_active');
|
||||
$tabbable.find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
$this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
return false;
|
||||
});
|
||||
// GNB Height 100%
|
||||
|
|
|
|||
7
modules/admin/tpl/js/admin.min.js
vendored
7
modules/admin/tpl/js/admin.min.js
vendored
|
|
@ -24,12 +24,11 @@ jQuery(function($){
|
|||
});
|
||||
*/
|
||||
// Tab Navigation
|
||||
var $tabbable = $('.x .x_tabbable');
|
||||
$tabbable.find('.x_tab-pane:not(".x_active")').hide();
|
||||
$tabbable.find('.x_nav-tabs>li>a').click(function(){
|
||||
$('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
|
||||
$('.x .x_nav-tabs').find('>li>a').click(function(){
|
||||
var $this = $(this);
|
||||
$this.parent('li').addClass('x_active').siblings().removeClass('x_active');
|
||||
$tabbable.find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
$this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
return false;
|
||||
});
|
||||
// GNB Height 100%
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@
|
|||
</div>
|
||||
<style>
|
||||
/* Site */
|
||||
body>.x{max-width:none}
|
||||
.x>.body>.content{margin-bottom:0}
|
||||
#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px}
|
||||
#site .btnBoth,
|
||||
|
|
|
|||
|
|
@ -477,6 +477,7 @@
|
|||
</div>
|
||||
<style>
|
||||
/* Site */
|
||||
body>.x{max-width:none}
|
||||
.x>.body>.content{margin-bottom:0}
|
||||
#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px}
|
||||
#site .btnBoth,
|
||||
|
|
@ -1194,22 +1195,22 @@ setTimeout(function(){
|
|||
$('input[type="file"]').change(function(){
|
||||
$(this).closest('form').submit();
|
||||
});
|
||||
var $fileBtn = $('.fileTrigger, .fileRemover');
|
||||
$fileBtn.click(function(){
|
||||
var $this = $(this);
|
||||
var $fileRemover = $this.parent('.btnBoth').children('.fileRemover');
|
||||
$('.fileRemover').click(function(){
|
||||
$(this).remove();
|
||||
});
|
||||
function fileRemoverDisplay(){
|
||||
setTimeout(function(){
|
||||
var imgLength = $this.closest('form').find('>figure>img').length; // hasImage
|
||||
if(imgLength){
|
||||
$fileRemover.show(); // Show remover
|
||||
} else {
|
||||
$fileRemover.hide(); // Hide remover
|
||||
}
|
||||
$('.fileRemover').each(function(){
|
||||
var $this = $(this);
|
||||
if($this.closest('form').find('>figure>img').length){
|
||||
$this.show(); // Show remover
|
||||
} else {
|
||||
$this.hide(); // Hide remover
|
||||
}
|
||||
});
|
||||
}, 1000);
|
||||
});
|
||||
$(window).load(function(){
|
||||
$fileBtn.trigger('click');
|
||||
});
|
||||
}
|
||||
$(window).load(fileRemoverDisplay);
|
||||
// Theme(layout | skin) list toggle
|
||||
$('.theme .list').each(function(){
|
||||
var $this = $(this);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue