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

Merge branch 'develop' into pr/new-config-format

Browse source
This commit is contained in:
Kijin Sung 2016-02-06 12:53:53 +09:00
commit 3c9429896a
16 changed files with 111 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/js/plugins/ui.colorpicker/xe_colorpicker.js
View file

@ -4,9 +4,12 @@
**/
jQuery(function($){
$.fn.xe_colorpicker = function(settings){
$.fn.xe_colorpicker = function(settings){
return this.jPicker(settings);
}
}
$('input.color-indicator').xe_colorpicker();
});
// 컬러 피커가 내장된 브라우저에서는 내장된 컬러피커 이용 by misol 2016.02.05
if ( $("input.color-indicator").prop('type') != 'color' ) {
$('input.color-indicator').xe_colorpicker();
}
});

6
common/tpl/popup_layout.html
View file

@ -1,7 +1,5 @@
<load target="../../modules/admin/tpl/css/admin.bootstrap.css" usecdn="true" />
<load target="../../modules/admin/tpl/css/admin.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../modules/admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../modules/admin/tpl/css/admin_en.css" usecdn="true" />
<load target="../../modules/admin/tpl/css/admin.bootstrap.css" />
<load target="../../modules/admin/tpl/css/admin.css" />
<div class="x popup">
{$content}
</div>