fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-12 13:32:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #302 from misol/lets-cleanup-css

Browse source 
관리자 페이지용 CSS 정리
This commit is contained in:
MinSoo Kim 2016-02-23 22:07:47 +09:00
commit edb4314688
7 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/display/HTMLDisplayHandler.php
View file

@ -394,7 +394,6 @@ class HTMLDisplayHandler
if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
{
Context::loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
Context::loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
Context::loadFile(array("./modules/admin/tpl/css/admin.iefix.css", '', 'ie', 10), true);
Context::loadFile('./modules/admin/tpl/js/admin.js', true);
Context::loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);

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

@ -2389,3 +2389,36 @@ html[lang="mn"] .x .g11n.active>[disabled],
height: 1px;
overflow: hidden;
}
/* language specific styles */
/* English admin_en.css */
html:lang(en) body>.x,
html:lang(en) .x table,
html:lang(en) .x input,
html:lang(en) .x textarea,
html:lang(en) .x select,
html:lang(en) .x button{font-family:Arial,Helvetica,sans-serif}
@media all and (max-width:980px){
html:lang(en) body>.x,
html:lang(en) .x table,
html:lang(en) .x input,
html:lang(en) .x textarea,
html:lang(en) .x select,
html:lang(en) .x button{font-family:sans-serif}
}
/* Korean admin_ko.css */
html:lang(ko) body>.x,
html:lang(ko) .x table,
html:lang(ko) .x input,
html:lang(ko) .x textarea,
html:lang(ko) .x select,
html:lang(ko) .x button{font-family: 'NanumGothic', 'Malgun Gothic', 'Apple SD Gothic Neo', 'Dotum', Arial, Helvetica, sans-serif}
/* Japanese admin_jp.css */
html:lang(ja) body>.x,
html:lang(ja) .x table,
html:lang(ja) .x input,
html:lang(ja) .x textarea,
html:lang(ja) .x select,
html:lang(ja) .x button{font-family:'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ',Meiryo,'ＭＳ Ｐゴシック',sans-serif}

5
modules/admin/tpl/css/admin_en.css
View file

@ -1,5 +0,0 @@
@charset "utf-8";
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:Arial,Helvetica,sans-serif}
@media all and (max-width:980px){
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:sans-serif}
}

5
modules/admin/tpl/css/admin_jp.css
View file

@ -1,5 +0,0 @@
@charset "utf-8";
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ',Meiryo,'ＭＳ Ｐゴシック',sans-serif}
@media all and (max-width:980px){
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ',Meiryo,'ＭＳ Ｐゴシック',sans-serif}
}

5
modules/admin/tpl/css/admin_ko.css
View file

@ -1,5 +0,0 @@
@charset "utf-8";
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,돋움,Dotum,Arial,Helvetica,sans-serif}
@media all and (max-width:980px){
body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:sans-serif}
}

2
modules/widget/tpl/widget_generate_code_in_page.html
View file

@ -1,7 +1,5 @@
<load target="../../admin/tpl/css/admin.bootstrap.css" />
<load target="../../admin/tpl/css/admin.css" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" />
<load target="../../admin/tpl/js/admin.js" />
<load target="js/generate_code.js" />
<load target="../../admin/tpl/js/jquery.tmpl.js" />

2
modules/widget/tpl/widget_style_generate_code_in_page.html
View file

@ -1,7 +1,5 @@
<load target="../../admin/tpl/css/admin.bootstrap.css" />
<load target="../../admin/tpl/css/admin.css" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" />
<load target="css/widget.css" />
<load target="../../admin/tpl/js/admin.js" />
<load target="../../admin/tpl/js/jquery.tmpl.js" />