mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-07 18:51:41 +09:00
Issue 2443. tabable nav UI bugfix.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11497 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
b0c1379af0
commit
0eeb8fd898
4 changed files with 48 additions and 8 deletions
|
|
@ -25,7 +25,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .x_btn-link{padding:0;margin:0;overflow:visible}
|
||||
.x [class^="x_icon-"],
|
||||
.x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0}
|
||||
.x .x_close{width:24px;height:24px}
|
||||
.x .x_close,
|
||||
.x_modal .x_close{width:24px;height:24px}
|
||||
.x .x_alert .x_close{top:-3px;right:-30px}
|
||||
.x .x_pagination ul>.x_active>a,
|
||||
.x .x_pagination ul>.x_active>span,
|
||||
|
|
@ -51,6 +52,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x label.x_inline{margin-right:16px}
|
||||
.x input[type="search"]+.x_btn,
|
||||
.x input[type="search"]+.x_btn+.x_btn{line-height:20px;font-size:14px;padding:4px 14px}
|
||||
.x_modal,
|
||||
.x_modal-backdrop{display:none}
|
||||
/* Custom Styles */
|
||||
.x .section{margin:20px 0}
|
||||
.x .section>h1{position:relative}
|
||||
|
|
@ -239,6 +242,7 @@ to{-o-transform:rotate(360deg)}
|
|||
.x .multilingual>label.x_add-on>input[type="checkbox"]{opacity:0;filter:alpha(opacity=0);position:relative;z-index:2}
|
||||
.x .multilingual>label.x_add-on{font-size:0;position:relative;cursor:pointer}
|
||||
.x .multilingual>label.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)}
|
||||
.x .multilingual>label.x_add-on:hover>i,
|
||||
.x .multilingual>label.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)}
|
||||
.x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center}
|
||||
.x .multilingual_item>.ko{background:url(../img/flag.ko.gif) no-repeat right center}
|
||||
|
|
|
|||
6
modules/admin/tpl/css/admin.min.css
vendored
6
modules/admin/tpl/css/admin.min.css
vendored
|
|
@ -25,7 +25,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .x_btn-link{padding:0;margin:0;overflow:visible}
|
||||
.x [class^="x_icon-"],
|
||||
.x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0}
|
||||
.x .x_close{width:24px;height:24px}
|
||||
.x .x_close,
|
||||
.x_modal .x_close{width:24px;height:24px}
|
||||
.x .x_alert .x_close{top:-3px;right:-30px}
|
||||
.x .x_pagination ul>.x_active>a,
|
||||
.x .x_pagination ul>.x_active>span,
|
||||
|
|
@ -51,6 +52,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x label.x_inline{margin-right:16px}
|
||||
.x input[type="search"]+.x_btn,
|
||||
.x input[type="search"]+.x_btn+.x_btn{line-height:20px;font-size:14px;padding:4px 14px}
|
||||
.x_modal,
|
||||
.x_modal-backdrop{display:none}
|
||||
/* Custom Styles */
|
||||
.x .section{margin:20px 0}
|
||||
.x .section>h1{position:relative}
|
||||
|
|
@ -239,6 +242,7 @@ to{-o-transform:rotate(360deg)}
|
|||
.x .multilingual>label.x_add-on>input[type="checkbox"]{opacity:0;filter:alpha(opacity=0);position:relative;z-index:2}
|
||||
.x .multilingual>label.x_add-on{font-size:0;position:relative;cursor:pointer}
|
||||
.x .multilingual>label.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)}
|
||||
.x .multilingual>label.x_add-on:hover>i,
|
||||
.x .multilingual>label.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)}
|
||||
.x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center}
|
||||
.x .multilingual_item>.ko{background:url(../img/flag.ko.gif) no-repeat right center}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ jQuery(function($){
|
|||
$('.x .skipNav>a').click(function(){
|
||||
$($(this).attr('href')).attr('tabindex','0').css('outline','0').focus();
|
||||
});
|
||||
/*
|
||||
/*
|
||||
// TARGET toggle
|
||||
$('.x [data-toggle]').click(function(){
|
||||
$($(this).attr('data-toggle')).toggle();
|
||||
|
|
@ -22,10 +22,10 @@ jQuery(function($){
|
|||
$($(this).attr('data-hide')).hide();
|
||||
return false;
|
||||
});
|
||||
*/
|
||||
*/
|
||||
// Tab Navigation
|
||||
$('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
|
||||
$('.x .x_nav-tabs').find('>li>a').click(function(){
|
||||
$('.x .x_nav-tabs').find('>li>a[href^="#"]').click(function(){
|
||||
var $this = $(this);
|
||||
$this.parent('li').addClass('x_active').siblings().removeClass('x_active');
|
||||
$this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
|
|
@ -140,4 +140,20 @@ jQuery(function($){
|
|||
$this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up');
|
||||
}
|
||||
});
|
||||
// Close Button
|
||||
$('.x_close').click(function(){
|
||||
$(this).parent().hide();
|
||||
});
|
||||
// Modal Window
|
||||
/*var $modal = $('.x_modal');
|
||||
if($modal.length >= 1){
|
||||
$('body').append('<div class="x_modal-backdrop"></div>').append($modal);
|
||||
}
|
||||
$('.x a').click(function(){
|
||||
var $this = $(this);
|
||||
var $bg = $('.x_modal-backdrop');
|
||||
if($($this.attr('href')).hasClass('x_modal')){
|
||||
$bg.show();
|
||||
}
|
||||
});*/
|
||||
});
|
||||
22
modules/admin/tpl/js/admin.min.js
vendored
22
modules/admin/tpl/js/admin.min.js
vendored
|
|
@ -6,7 +6,7 @@ jQuery(function($){
|
|||
$('.x .skipNav>a').click(function(){
|
||||
$($(this).attr('href')).attr('tabindex','0').css('outline','0').focus();
|
||||
});
|
||||
/*
|
||||
/*
|
||||
// TARGET toggle
|
||||
$('.x [data-toggle]').click(function(){
|
||||
$($(this).attr('data-toggle')).toggle();
|
||||
|
|
@ -22,10 +22,10 @@ jQuery(function($){
|
|||
$($(this).attr('data-hide')).hide();
|
||||
return false;
|
||||
});
|
||||
*/
|
||||
*/
|
||||
// Tab Navigation
|
||||
$('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
|
||||
$('.x .x_nav-tabs').find('>li>a').click(function(){
|
||||
$('.x .x_nav-tabs').find('>li>a[href^="#"]').click(function(){
|
||||
var $this = $(this);
|
||||
$this.parent('li').addClass('x_active').siblings().removeClass('x_active');
|
||||
$this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
|
||||
|
|
@ -140,4 +140,20 @@ jQuery(function($){
|
|||
$this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up');
|
||||
}
|
||||
});
|
||||
// Close Button
|
||||
$('.x_close').click(function(){
|
||||
$(this).parent().hide();
|
||||
});
|
||||
// Modal Window
|
||||
/*var $modal = $('.x_modal');
|
||||
if($modal.length >= 1){
|
||||
$('body').append('<div class="x_modal-backdrop"></div>').append($modal);
|
||||
}
|
||||
$('.x a').click(function(){
|
||||
var $this = $(this);
|
||||
var $bg = $('.x_modal-backdrop');
|
||||
if($($this.attr('href')).hasClass('x_modal')){
|
||||
$bg.show();
|
||||
}
|
||||
});*/
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue