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

다른 프레임워크와 css 충돌을 피하기 위해 rhymix.less의 class/id 이름에 prefix 처리

Browse source 
변경전의 xe.less 파일도 rhymix.less와 함께 load 하여 호환정 유지

CSS 충돌 예)
bootstrap의 .btn
사용 예)
bootstrap 사용시엔 {Context::unloadBasicFiles('xe')}으로 unload 시키면 문제없음
This commit is contained in:
conory 2018-08-03 19:45:30 +09:00
parent 30e0a5c583
commit b1cb1f3f34
251 changed files with 938 additions and 776 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/layout/tpl/copy_layout.html
View file

@ -5,7 +5,7 @@ var addLang = '{$lang->cmd_insert}';
</script>
<load target="js/layout_admin.js" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/copy_layout/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/copy_layout/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>

2
modules/layout/tpl/header.html
View file

@ -62,6 +62,6 @@
'modules/layout/tpl/layout_instance_list/2' => 1
);
}
<div cond="$XE_VALIDATOR_MESSAGE && isset($validator_ids[$XE_VALIDATOR_ID])" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && isset($validator_ids[$XE_VALIDATOR_ID])" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>

6
modules/layout/tpl/layout_edit.html
View file

@ -29,7 +29,7 @@
</li>
</ul>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/layout_edit/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/layout_edit/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -42,7 +42,7 @@
<input type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
<span class="x_help-inline">{$lang->msg_layout_image_target}</span>
</p>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
@ -83,7 +83,7 @@
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<span class="x_pull-left">
<button type="submit" class="x_btn" name="mode" value="reset">{$lang->cmd_reset}</button>
</span>

6
modules/layout/tpl/layout_html_css_view.html
View file

@ -33,7 +33,7 @@
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
<p>{$lang->msg_layout_image_target}</p>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_upload}</button>
</div>
@ -66,7 +66,7 @@
<block loop="$widget_list => $widget"> <i class="vr">|</i> <a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></block>
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<span class="x_pull-left">
<button type="submit" class="x_btn" name="mode" value="reset">{$lang->cmd_reset}</button>
</span>
@ -88,7 +88,7 @@
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<span class="x_pull-left">
<button type="submit" class="x_btn" name="mode" value="reset">{$lang->cmd_reset}</button>
</span>

2
modules/layout/tpl/layout_info_view.html
View file

@ -160,7 +160,7 @@
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<span class="etc">
<a cond="$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout, 'type', $type)}">{$lang->cmd_list}</a>
<a cond="!$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList', 'type', $type)}">{$lang->cmd_list}</a>