fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2896 fixed. IE 7 bugfix.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12741 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-02-13 05:51:49 +00:00
parent 02f56601e2
commit e84fd89249
5 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/admin/tpl/css/admin.css
View file

@ -93,7 +93,7 @@ body>.x,
.x input:checked+label, .x input:checked+label,
.x .x_form-horizontal .x_control-label{font-weight:bold;word-break:keep-all} .x .x_form-horizontal .x_control-label{font-weight:bold;word-break:keep-all}
.x .x_form-horizontal .x_control-label{width:180px} .x .x_form-horizontal .x_control-label{width:180px}
.x .x_form-horizontal .x_controls{margin-left:200px} .x .x_form-horizontal .x_controls{margin-left:200px;*margin-left:0}
.x .x_form-horizontal .x_controls label{padding:5px 0;margin-bottom:0} .x .x_form-horizontal .x_controls label{padding:5px 0;margin-bottom:0}
.x input[type="radio"]+label, .x input[type="radio"]+label,
.x input[type="checkbox"]+label{font-weight:normal} .x input[type="checkbox"]+label{font-weight:normal}
@ -283,7 +283,7 @@ body>.x,
.x>.body>.gnb>a>i{display:none} .x>.body>.gnb>a>i{display:none}
.x>.body>.gnb .exMenu{position:absolute;width:100%} .x>.body>.gnb .exMenu{position:absolute;width:100%}
.x>.body>.gnb .exMenu>button{width:100%;border:0;background:none;font-size:20px;line-height:25px} .x>.body>.gnb .exMenu>button{width:100%;border:0;background:none;font-size:20px;line-height:25px}
.x>.body>.gnb .exMenu>button>i{opacity:.5;filter:alpha(opacity=50);vertical-align:middle} .x>.body>.gnb .exMenu>button>i{opacity:.5;filter:alpha(opacity=50);vertical-align:middle;text-indent:0}
.x>.body>.gnb .exMenu>button:hover>i, .x>.body>.gnb .exMenu>button:hover>i,
.x>.body>.gnb .exMenu>button:focus>i{opacity:1;filter:alpha(opacity=100)} .x>.body>.gnb .exMenu>button:focus>i{opacity:1;filter:alpha(opacity=100)}
.x>.body>.gnb .exMenu .x_icon-chevron-up, .x>.body>.gnb .exMenu .x_icon-chevron-up,

2
modules/admin/tpl/css/admin.min.css vendored
View file

File diff suppressed because one or more lines are too long

5
modules/menu/lang/lang.xml
View file

@ -881,5 +881,8 @@ Menu không phải là người quản lý, nhiệm vụ của nó chỉ là li
<value xml:lang="ko"><![CDATA[버튼 이미지가 삭제 됐습니다.]]></value> <value xml:lang="ko"><![CDATA[버튼 이미지가 삭제 됐습니다.]]></value>
<value xml:lang="en"><![CDATA[Button image is deleted.]]></value> <value xml:lang="en"><![CDATA[Button image is deleted.]]></value>
</item> </item>
<item name="do_not_display_again">
<value xml:lang="ko"><![CDATA[다시 보지 않기.]]></value>
<value xml:lang="en"><![CDATA[Do not display again.]]></value>
</item>
</lang> </lang>

20
modules/menu/tpl/css/sitemap.css
View file

@ -31,6 +31,7 @@
#add_menu .desc>a:hover, #add_menu .desc>a:hover,
#add_menu .desc>a:focus{opacity:1;filter:alpha(opacity=100)} #add_menu .desc>a:focus{opacity:1;filter:alpha(opacity=100)}
/* Site */ /* Site */
.x_icon-question-sign{height:0 !important;padding:14px 0 0 0 !important}
body>.x{max-width:none !important} body>.x{max-width:none !important}
.x>.body{padding-bottom:10px !important} .x>.body{padding-bottom:10px !important}
.x>.body>.content{margin-bottom:0} .x>.body>.content{margin-bottom:0}
@ -208,7 +209,7 @@ body>.x{max-width:none !important}
#properties li:first-child{border:0} #properties li:first-child{border:0}
#properties li>strong{margin:0 0 0 8px} #properties li>strong{margin:0 0 0 8px}
#properties li>a, #properties li>a,
#properties li>button{color:#000;position:relative;display:block;padding:0 8px;line-height:30px;background-color:transparent;border:0;text-align:left;text-decoration:none;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s} #properties li>button{color:#000;position:relative;display:block;padding:0 8px;line-height:30px;background-color:transparent;border:0;text-align:left;text-decoration:none;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;*zoom:1}
#properties li>a{padding:0 24px 0 8px} #properties li>a{padding:0 24px 0 8px}
#properties li.type{height:30px;line-height:30px} #properties li.type{height:30px;line-height:30px}
#properties li.homepage>label{line-height:30px} #properties li.homepage>label{line-height:30px}
@ -229,7 +230,6 @@ body>.x{max-width:none !important}
#properties._hasFullSetup ._hasFullSetupO{display:block} #properties._hasFullSetup ._hasFullSetupO{display:block}
#properties._hasFullSetup ._hasFullSetupX{display:none} #properties._hasFullSetup ._hasFullSetupX{display:none}
#properties .homepage input[checked="checked"]+span{font-weight:bold} #properties .homepage input[checked="checked"]+span{font-weight:bold}
/* Add */ /* Add */
#add>*>.x_btn-group{border:0;padding:0} #add>*>.x_btn-group{border:0;padding:0}
/* Add Menu */ /* Add Menu */
@ -274,8 +274,9 @@ body>.x{max-width:none !important}
#design .x_nav a{padding-top:5px;padding-bottom:4px} #design .x_nav a{padding-top:5px;padding-bottom:4px}
#design .btnBoth{border:0} #design .btnBoth{border:0}
#design img{width:220px} #design img{width:220px}
#design .shadow{position:relative;box-shadow:0 0 4px #999 inset;padding:4px;height:160px;overflow:hidden;border-radius:3px} #design .shadow{position:relative;box-shadow:0 0 4px #999 inset;padding:4px;height:160px;overflow:hidden;border-radius:3px;*border:1px solid #ddd}
#design .shadow>iframe{border:0;filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.20,M22=0.20,SizingMethod='auto expand');-webkit-transform-origin:0 0;-webkit-transform:scale(.20);-moz-transform-origin:0 0;-moz-transform:scale(.20);-0-transform-origin:0 0;-0-transform:scale(.20);transform-origin:0 0;transform:scale(.20);position:absolute} #design .shadow>iframe{border:0;*zoom:0.2;-webkit-transform-origin:0 0;-webkit-transform:scale(.20);-moz-transform-origin:0 0;-moz-transform:scale(.20);-0-transform-origin:0 0;-0-transform:scale(.20);-ms-transform-origin:0 0;-ms-transform:scale(.20);transform-origin:0 0;transform:scale(.20);position:absolute}
/*body{background:red}*/
#design #pc .shadow>iframe{width:1024px;height:768px;left:50%;margin-left:-102px} #design #pc .shadow>iframe{width:1024px;height:768px;left:50%;margin-left:-102px}
#design #mobile .shadow>iframe{width:480px;height:800px;left:50%;margin-left:-48px} #design #mobile .shadow>iframe{width:480px;height:800px;left:50%;margin-left:-48px}
#design .x_icon-zoom-in{position:absolute;right:4px;bottom:4px;width:24px;height:24px;border-radius:3px;background-color:#666;opacity:.75;filter:alpha(opacity:75);background-position:-331px 5px} #design .x_icon-zoom-in{position:absolute;right:4px;bottom:4px;width:24px;height:24px;border-radius:3px;background-color:#666;opacity:.75;filter:alpha(opacity:75);background-position:-331px 5px}
@ -291,9 +292,12 @@ body>.x{max-width:none !important}
/* Layout */ /* Layout */
#layout li ul._edit_menu {display:none} #layout li ul._edit_menu {display:none}
#layout li.selected ul._edit_menu {display:block} #layout li.selected ul._edit_menu {display:block}
#layout .list, #skin .list{position:relative} #layout .list,
#layout .mask, #skin .mask{display:none;position:absolute;width:100%;height:100%;left:0;top:0;background:#fff;opacity:.5;filter:alpha(opacity=50);z-index:99} #skin .list{position:relative}
#layout .disabled>.mask, #skin .disabled>.mask{display:block;cursor:not-allowed} #layout .mask,
#skin .mask{display:none;position:absolute;width:100%;height:100%;left:0;top:0;background:#fff;opacity:.5;filter:alpha(opacity=50);z-index:99}
#layout .disabled>.mask,
#skin .disabled>.mask{display:block;cursor:not-allowed}
/* Full Setup */ /* Full Setup */
#fullSetup .x_btn-group{position:absolute;right:4px;bottom:4px} #fullSetup .x_btn-group{position:absolute;right:4px;bottom:4px}
/* Message Box */ /* Message Box */
@ -312,4 +316,4 @@ body>.x{max-width:none !important}
._siteDesign #design ._site{display:block} ._siteDesign #design ._site{display:block}
/* Help Alert */ /* Help Alert */
._quick_help{display:none;position:fixed !important;*position:absolute !important;top:60px;left:226px;z-index:100;width:600px;box-shadow:0 0 3px #000;color:#333} ._quick_help{display:none;position:fixed !important;*position:absolute !important;top:60px;left:226px;z-index:100;width:600px;box-shadow:0 0 3px #000;color:#333}
._quick_help>label{display:inline-block;cursor:pointer} ._quick_help>label{display:inline-block;cursor:pointer}

12
modules/menu/tpl/sitemap.html
View file

@ -10,7 +10,7 @@
<div class="_quick_help x_alert"> <div class="_quick_help x_alert">
<p class="_quick_help_msg">msg</p> <p class="_quick_help_msg">msg</p>
<label><input class="_quick_help_nomore" type="checkbox"/> 다시 보지 않기</label> <label><input class="_quick_help_nomore" type="checkbox"/> {$lang->do_not_display_again}</label>
</div> </div>
<!--@if($act == 'dispMenuAdminSiteMap')--> <!--@if($act == 'dispMenuAdminSiteMap')-->
@ -226,16 +226,6 @@
<li style="padding:0 0 6px 0"> <li style="padding:0 0 6px 0">
<label><input type="checkbox" class="_leaveUnfolded" title="{$lang->menu_expand}"> {$lang->menu_expand}</label> <label><input type="checkbox" class="_leaveUnfolded" title="{$lang->menu_expand}"> {$lang->menu_expand}</label>
</li> </li>
<!--li class="menuType">
<div style="line-height:30px">
<strong>{$lang->menu_type}</strong>: <span class="module_type"></span> <a href="#menuTypeHelpInDefault" class="x_icon-question-sign" data-admin-toggle="#menuTypeHelpInDefault">{$lang->help}</a>
</div>
<div id="menuTypeHelpInDefault" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#menuTypeHelpInDefault">×</button>
<p>{$lang->about_menu_type_in_default}</p>
</div>
</li-->
<li class="typePage" style="border-top:1px solid #DDD"> <li class="typePage" style="border-top:1px solid #DDD">
<label for="lang_pageTitle">{$lang->browser_title} <a href="#help_menuName" class="x_icon-question-sign" data-admin-toggle="#help_menuName">{$lang->help}</a></label> <label for="lang_pageTitle">{$lang->browser_title} <a href="#help_menuName" class="x_icon-question-sign" data-admin-toggle="#help_menuName">{$lang->help}</a></label>
<div id="help_menuName" class="x_alert x_alert-info" style="display:none;width:169px"> <div id="help_menuName" class="x_alert x_alert-info" style="display:none;width:169px">