Common UI and .x_btn style cleaning.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12222 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-11-14 15:28:42 +00:00
parent 9984a9e9af
commit 27c12c5dfb
55 changed files with 203 additions and 225 deletions

View file

@ -11,7 +11,7 @@
<ul>
<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'is_admin', 'Y', 'member_srl', $logged_info->member_srl)}">{$logged_info->email_address}</a></li>
<li><a href="{getUrl('', 'module','admin','act','procAdminLogout')}">{$lang->cmd_logout}</a></li>
<li><a href="#lang" class="lang" data-toggle="#lang">{$lang_supported[$lang_type]}</a>
<li><a href="#lang" class="lang" data-toggle>{$lang_supported[$lang_type]}</a>
<ul id="lang" class="x_dropdown-menu">
<li loop="$lang_supported=>$key,$val" class="x_active"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
</ul>

View file

@ -61,7 +61,7 @@
</ul>
<div class="x_clearfix btnArea">
<div class="x_pull-left">
<button value="procAdminMenuReset" name="act" type="submit" class="x_btn x_btn-warning">{$lang->cmd_reset}</button>
<button value="procAdminMenuReset" name="act" type="submit" class="x_btn">{$lang->cmd_reset}</button>
</div>
<div class="x_pull-right">
<button type="submit" value="procMenuAdminArrangeItem" name="act" class="x_btn x_btn-primary">{$lang->cmd_save}</button>

View file

@ -41,19 +41,19 @@
</section>
<section class="section collapse">
<h1>{$lang->subtitle_advanced}</h1>
<div class="x_control-group" style="display:none">
<div class="x_control-group" hidden>
<label class="x_control-label" for="ftp_host">{$lang->ftp_host}</label>
<div class="x_controls">
<input type="text" name="ftp_host" id="ftp_host" value="{$ftp_info->ftp_host ? $ftp_info->ftp_host : '127.0.0.1'}" /> Default : 127.0.0.1
</div>
</div>
<div class="x_control-group" style="display:none">
<div class="x_control-group" hidden>
<label class="x_control-label" for="ftp_port">{$lang->ftp_port}</label>
<div class="x_controls">
<input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port ? $ftp_info->ftp_port : '21'}" /> Default : 21
</div>
</div>
<div class="x_control-group" style="display:none">
<div class="x_control-group" hidden>
<p class="x_control-label">{$lang->use_ftp_passive_mode}</p>
<div class="x_controls">
<label class="x_inline" for="ftp_passive_y">
@ -66,7 +66,7 @@
</label>
</div>
</div>
<div class="x_control-group" style="display:none">
<div class="x_control-group" hidden>
<label class="x_control-label" for="sftp_n">{$lang->use_sftp_support}</label>
<div class="x_controls">
<label class="x_inline" for="sftp_y"><input type="radio" name="sftp" id="sftp_y" value="Y" checked="checked"|cond="$ftp_info->sftp == 'Y'" disabled|cond="!$sftp_support" />{$lang->cmd_yes}</label>
@ -76,7 +76,7 @@
</div>
</section>
<div class="btnArea">
<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-large x_btn-primary x_pull-right" />
<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary x_pull-right" />
</div>
</form>
<style>

View file

@ -2,7 +2,7 @@
/* Reset */
html,body{min-height:100%}
body{margin:8px;-webkit-text-size-adjust:none}
body>.x{min-width:300px;max-width:1240px}
body>.x{min-width:300px;max-width:1240px;margin:0 auto}
body>.x,
.x label,
.x table,
@ -16,7 +16,7 @@ body>.x,
.x dfn{font-style:normal}
.x [disabled]{cursor:not-allowed}
.x button[disabled]{color:#ccc !important}
.x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)}
.x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:-2px 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)}
.x a[target="_blank"]:hover:after,
.x a[target="_blank"]:focus:after{opacity:.7;filter:alpha(opacity=70)}
/* Bootstrap Override */
@ -48,7 +48,7 @@ body>.x,
.x .x_pagination ul>li>strong{line-height:24px;padding:0 8px}
.x .x_pagination ul>.x_active>a,
.x .x_pagination ul>.x_active>span,
.x .x_pagination ul>.x_active>strong{line-height:26px;border:0;background-color:#555;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif}
.x .x_pagination ul>.x_active>strong{line-height:26px;border:0;background-color:#666;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif}
.x .x_pagination [id^="goTo"]{display:none;margin:0;padding:0}
.x .x_pagination [id^="goTo"]>*{border:0;border-radius:0}
.x .x_pagination [id^="goTo"]>[type="number"]{height:16px;line-height:16px;width:50px;text-align:center}
@ -279,7 +279,7 @@ body>.x,
/* li>ul>li */
.x>.xin>.body>.gnb>ul>li>ul>li{border-top:1px solid #ddd;position:relative}
.x>.xin>.body>.gnb>ul>li>ul>li:first-child{border:0}
.x>.xin>.body>.gnb>ul>li>ul>li.active_{box-shadow:0 0 3px #000;z-index:99;border:1px solid #000;border-left:0;border-right:0}
.x>.xin>.body>.gnb>ul>li>ul>li.active_{box-shadow:0 0 3px #999;z-index:99;border:1px solid #666;border-left:0;border-right:0}
/* li>ul>li>a */
.x>.xin>.body>.gnb>ul>li>ul>li>a{padding:4px 5px 4px 15px;background:#e8e8e8;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f1),to(#e8e8e8));background:-moz-linear-gradient(top,#f1f1f1,#e8e8e8);background:-o-linear-gradient(top,#f1f1f1,#e8e8e8)}
.x>.xin>.body>.gnb>ul>li>ul#favorite>li>a{padding:4px 25px 4px 15px}

File diff suppressed because one or more lines are too long

View file

@ -53,9 +53,9 @@ jQuery(function($){
var focusable = 'a,input,button,textarea,select';
$target.toggle();
if($target.is(':visible') && !$target.find(focusable).length){
$target.attr('tabindex','0').not(':disabled').focus();
$target.not(':disabled').attr('tabindex','0').css('outline','0').focus();
} else if($target.is(':visible') && $target.find(focusable).length) {
$target.find(focusable).not(':disabled').eq(0).focus();
$target.not(':disabled').find(focusable).eq(0).focus();
} else {
$this.focus();
}

File diff suppressed because one or more lines are too long