From b1cb1f3f34e77f28d1872224761c3373fe2e41d3 Mon Sep 17 00:00:00 2001 From: conory Date: Fri, 3 Aug 2018 19:45:30 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=9E=84=EC=9B=8C=ED=81=AC=EC=99=80=20css=20=EC=B6=A9=EB=8F=8C?= =?UTF-8?q?=EC=9D=84=20=ED=94=BC=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?rhymix.less=EC=9D=98=20class/id=20=EC=9D=B4=EB=A6=84=EC=97=90?= =?UTF-8?q?=20prefix=20=EC=B2=98=EB=A6=AC=20=EB=B3=80=EA=B2=BD=EC=A0=84?= =?UTF-8?q?=EC=9D=98=20xe.less=20=ED=8C=8C=EC=9D=BC=EB=8F=84=20rhymix.less?= =?UTF-8?q?=EC=99=80=20=ED=95=A8=EA=BB=98=20load=20=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=ED=98=B8=ED=99=98=EC=A0=95=20=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CSS 충돌 예) bootstrap의 .btn 사용 예) bootstrap 사용시엔 {Context::unloadBasicFiles('xe')}으로 unload 시키면 문제없음 --- addons/autolink/autolink.js | 6 +- addons/autolink/autolink.spec.html | 2 +- addons/photoswipe/rx_photoswipe.js | 2 +- .../resize_image/css/resize_image.mobile.css | 2 +- addons/resize_image/js/resize_image.js | 4 +- classes/context/Context.class.php | 2 +- classes/display/HTMLDisplayHandler.php | 4 + classes/extravar/Extravar.class.php | 2 +- common/css/mobile.css | 36 --- common/css/rhymix.less | 142 ++++++---- common/css/xe.less | 245 ++++++++++++++++++ common/js/common.js | 16 +- .../js/plugins/jquery.fileupload/js/main.js | 2 +- common/js/plugins/spectrum/index.html | 2 +- common/js/xml_handler.js | 24 +- layouts/xedition/layout.html | 2 +- modules/addon/tpl/addon_list.html | 2 +- modules/addon/tpl/setup_addon.html | 8 +- modules/admin/tpl/admin_setup.html | 6 +- modules/admin/tpl/config_advanced.html | 4 +- modules/admin/tpl/config_debug.html | 4 +- modules/admin/tpl/config_domains.html | 4 +- modules/admin/tpl/config_domains_edit.html | 4 +- modules/admin/tpl/config_ftp.html | 4 +- modules/admin/tpl/config_notification.html | 4 +- modules/admin/tpl/config_security.html | 4 +- modules/admin/tpl/config_seo.html | 4 +- modules/admin/tpl/config_sitelock.html | 4 +- modules/admin/tpl/css/admin.css | 7 +- modules/admin/tpl/index.html | 12 +- modules/admin/tpl/layout.html | 2 +- modules/advanced_mailer/tpl/config.html | 4 +- modules/advanced_mailer/tpl/exceptions.html | 4 +- modules/advanced_mailer/tpl/mail_test.html | 4 +- modules/advanced_mailer/tpl/sms_test.html | 4 +- modules/autoinstall/tpl/index.html | 2 +- modules/autoinstall/tpl/install.html | 6 +- modules/autoinstall/tpl/js/waiting.js | 4 +- modules/autoinstall/tpl/uninstall.html | 4 +- modules/board/m.skins/default/comment.html | 4 +- modules/board/m.skins/default/css/mboard.css | 10 +- modules/board/m.skins/default/read.html | 2 +- .../board/m.skins/simpleGray/css/mboard.css | 2 +- modules/board/skins/default/_comment.html | 12 +- modules/board/skins/default/_read.html | 14 +- modules/board/skins/default/board.default.css | 8 +- modules/board/skins/default/comment_form.html | 4 +- .../skins/default/delete_comment_form.html | 6 +- modules/board/skins/default/delete_form.html | 6 +- .../skins/default/delete_trackback_form.html | 6 +- .../skins/default/input_password_form.html | 2 +- modules/board/skins/default/list.html | 14 +- modules/board/skins/default/message.html | 6 +- modules/board/skins/default/tag_list.html | 2 +- modules/board/skins/default/write_form.html | 8 +- modules/board/skins/xedition/_comment.html | 6 +- modules/board/skins/xedition/_read.html | 18 +- .../board/skins/xedition/board.default.css | 8 +- .../skins/xedition/delete_comment_form.html | 6 +- modules/board/skins/xedition/delete_form.html | 6 +- .../skins/xedition/delete_trackback_form.html | 6 +- .../skins/xedition/input_password_form.html | 2 +- modules/board/skins/xedition/list.html | 18 +- modules/board/skins/xedition/message.html | 6 +- modules/board/skins/xedition/tag_list.html | 2 +- modules/board/skins/xedition/update_view.html | 2 +- modules/board/skins/xedition/vote_log.html | 4 +- modules/board/skins/xedition/write_form.html | 4 +- modules/board/tpl/addition_setup.html | 2 +- modules/board/tpl/board_delete.html | 2 +- modules/board/tpl/board_insert.html | 4 +- modules/board/tpl/category_list.html | 4 +- modules/board/tpl/index.html | 2 +- modules/comment/comment.item.php | 2 +- modules/comment/tpl/comment_list.html | 6 +- .../comment/tpl/comment_module_config.html | 2 +- modules/comment/tpl/declare_comment.html | 2 +- modules/comment/tpl/declared_list.html | 2 +- modules/comment/tpl/declared_log.html | 6 +- .../m.skins/default/css/mcommunication.css | 10 +- .../m.skins/default/send_message.html | 2 +- .../communication/m.skins/rx_prn/friends.html | 2 +- .../m.skins/rx_prn/messages.html | 2 +- .../m.skins/rx_prn/new_message.html | 2 +- .../m.skins/rx_prn/send_message.html | 2 +- .../skins/default/add_friend.html | 8 +- .../skins/default/add_friend_group.html | 8 +- .../skins/default/css/communication.css | 75 ++---- .../communication/skins/default/friends.html | 24 +- .../communication/skins/default/messages.html | 24 +- .../skins/default/new_message.html | 12 +- .../skins/default/send_message.html | 8 +- .../skins/simple_world/css/css.less | 4 +- .../skins/simple_world/friends.html | 2 +- .../skins/simple_world/messages.html | 2 +- .../skins/simple_world/new_message.html | 2 +- .../skins/simple_world/send_message.html | 2 +- modules/communication/tpl/index.html | 4 +- .../tpl/js/member_communication.js | 2 +- modules/document/document.item.php | 2 +- modules/document/tpl/category_list.html | 4 +- modules/document/tpl/declare_document.html | 2 +- modules/document/tpl/declared_list.html | 4 +- modules/document/tpl/declared_log.html | 6 +- modules/document/tpl/document_alias.html | 4 +- modules/document/tpl/document_config.html | 4 +- modules/document/tpl/document_list.html | 6 +- .../document/tpl/document_module_config.html | 2 +- modules/document/tpl/document_trash_list.html | 6 +- modules/document/tpl/extra_keys.html | 4 +- modules/document/tpl/preview_page.html | 4 +- modules/document/tpl/print_page.html | 2 +- .../components/image_gallery/tpl/popup.html | 2 +- .../components/image_link/tpl/popup.html | 2 +- .../components/poll_maker/tpl/popup.html | 2 +- .../editor/skins/ckeditor/file_upload.html | 4 +- modules/editor/tpl/admin_index.html | 4 +- modules/editor/tpl/editor_frame.html | 2 +- modules/editor/tpl/setup_component.html | 4 +- modules/file/tpl/adminConfig.html | 4 +- modules/file/tpl/file_list.html | 8 +- modules/file/tpl/file_module_config.html | 2 +- modules/importer/tpl/index.html | 8 +- modules/importer/tpl/process.html | 6 +- modules/install/tpl/css/install.css | 2 +- modules/install/tpl/db_config.html | 2 +- modules/install/tpl/license_agreement.html | 2 +- modules/install/tpl/other_config.html | 2 +- .../integration_search.admin.view.php | 2 +- .../skins/default/document.html | 2 +- .../skins/misol_town/document.html | 2 +- modules/integration_search/tpl/index.html | 4 +- modules/integration_search/tpl/skin_info.html | 4 +- modules/krzip/tpl/config.html | 4 +- modules/krzip/tpl/template.daumapi.html | 2 +- modules/krzip/tpl/template.epostapi.html | 2 +- modules/krzip/tpl/template.postcodify.html | 2 +- modules/layout/layout.view.php | 2 +- modules/layout/tpl/copy_layout.html | 2 +- modules/layout/tpl/header.html | 2 +- modules/layout/tpl/layout_edit.html | 6 +- modules/layout/tpl/layout_html_css_view.html | 6 +- modules/layout/tpl/layout_info_view.html | 2 +- .../m.skins/default/find_member_account.html | 2 +- .../member/m.skins/default/leave_form.html | 2 +- .../member/m.skins/default/login_form.html | 2 +- .../member/m.skins/default/member_info.html | 2 +- .../m.skins/default/modify_email_address.html | 2 +- .../member/m.skins/default/modify_info.html | 2 +- .../m.skins/default/modify_password.html | 2 +- .../m.skins/default/rechecked_password.html | 2 +- .../member/m.skins/default/signup_form.html | 2 +- modules/member/m.skins/rx_prn/css/css.less | 2 +- .../m.skins/rx_prn/modify_email_address.html | 2 +- modules/member/m.skins/rx_prn/reset_mail.html | 4 +- modules/member/member.admin.view.php | 4 +- modules/member/skins/default/css/member.css | 77 ++---- .../skins/default/find_member_account.html | 8 +- modules/member/skins/default/leave_form.html | 4 +- modules/member/skins/default/login_form.html | 4 +- modules/member/skins/default/logout.html | 2 +- modules/member/skins/default/member_info.html | 12 +- .../skins/default/modify_email_address.html | 4 +- modules/member/skins/default/modify_info.html | 8 +- .../member/skins/default/modify_password.html | 4 +- .../skins/default/rechecked_password.html | 4 +- .../skins/default/resend_auth_mail.html | 4 +- modules/member/skins/default/reset_mail.html | 6 +- .../member/skins/default/scrapped_list.html | 14 +- modules/member/skins/default/signup_form.html | 8 +- modules/member/skins/simple_world/css/css.css | 6 +- .../member/skins/simple_world/css/css.less | 6 +- .../simple_world/modify_email_address.html | 2 +- .../member/skins/simple_world/reset_mail.html | 4 +- .../skins/simple_world/scrapped_list.html | 6 +- modules/member/tpl/agreements_config.html | 6 +- modules/member/tpl/default_config.html | 2 +- modules/member/tpl/design_config.html | 2 +- modules/member/tpl/features_config.html | 2 +- modules/member/tpl/group_list.html | 2 +- modules/member/tpl/header.html | 2 +- modules/member/tpl/insert_member.html | 4 +- modules/member/tpl/login_config.html | 2 +- modules/member/tpl/member_list.html | 4 +- modules/member/tpl/signup_config.html | 2 +- modules/menu/tpl/sitemap.html | 2 +- .../m.skins/default/system_message.html | 4 +- modules/message/skins/default/message.css | 2 +- .../message/skins/default/system_message.html | 10 +- .../skins/simple_world/css/message.less | 6 +- .../message/skins/xedition/css/message.css | 2 +- .../skins/xedition/system_message.html | 4 +- modules/message/tpl/config.html | 4 +- modules/module/tpl/adminFileBox.html | 4 +- modules/module/tpl/category_list.html | 2 +- modules/module/tpl/category_update_form.html | 2 +- modules/module/tpl/copy_module.html | 2 +- modules/module/tpl/filebox_add.html | 4 +- modules/module/tpl/filebox_list.html | 4 +- modules/module/tpl/include.filebox.html | 2 +- .../tpl/include.module_grant_setup.html | 2 +- modules/module/tpl/include.module_setup.html | 2 +- modules/module/tpl/module_grant_setup.html | 2 +- modules/module/tpl/module_grants.html | 2 +- modules/module/tpl/module_list.html | 4 +- modules/module/tpl/module_setup.html | 2 +- modules/module/tpl/multilingual_v17.html | 2 +- modules/module/tpl/skin_config.html | 4 +- .../m.skins/default/userconfig.html | 6 +- .../ncenterlite/skins/default/userconfig.html | 6 +- .../skins/default_bottom/userconfig.html | 6 +- modules/ncenterlite/tpl/advancedconfig.html | 2 +- modules/ncenterlite/tpl/config.html | 2 +- modules/ncenterlite/tpl/header.html | 2 +- modules/ncenterlite/tpl/seletedmid.html | 2 +- modules/ncenterlite/tpl/skinsetting.html | 2 +- modules/page/tpl/addition_setup.html | 2 +- modules/page/tpl/article_content_footer.html | 8 +- modules/page/tpl/article_content_modify.html | 8 +- modules/page/tpl/content.html | 12 +- modules/page/tpl/index.html | 2 +- modules/page/tpl/mcontent.html | 12 +- modules/page/tpl/page_content_modify.html | 16 +- modules/page/tpl/page_delete.html | 4 +- modules/page/tpl/page_info.html | 4 +- .../page/tpl/page_mobile_content_modify.html | 16 +- modules/point/tpl/config.html | 4 +- modules/point/tpl/member_list.html | 4 +- modules/point/tpl/module_config.html | 2 +- modules/point/tpl/point_module_config.html | 2 +- modules/poll/skins/default/form.html | 6 +- modules/poll/skins/default/result.html | 2 +- modules/poll/skins/simple/form.html | 2 +- modules/poll/skins/simple/result.html | 2 +- modules/poll/tpl/config.html | 6 +- modules/poll/tpl/poll_list.html | 4 +- modules/rss/tpl/rss_admin_index.html | 4 +- modules/rss/tpl/rss_module_config.html | 2 +- modules/spamfilter/tpl/config_block.html | 2 +- modules/spamfilter/tpl/header.html | 2 +- modules/trash/tpl/header.html | 2 +- modules/trash/tpl/trash_list.html | 4 +- modules/trash/tpl/trash_view.html | 4 +- modules/widget/tpl/header.html | 2 +- modules/widget/tpl/widget_generate_code.html | 2 +- .../tpl/widget_generate_code_in_page.html | 2 +- modules/widget/widget.controller.php | 6 +- .../login_info/skins/default/login_form.html | 2 +- .../skins/ncenter_login/login_form.html | 2 +- .../pollWidget/skins/default/pollview.html | 22 +- widgets/pollWidget/skins/simple/pollview.html | 22 +- 251 files changed, 938 insertions(+), 776 deletions(-) create mode 100644 common/css/xe.less diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js index c118be337..e19ed7402 100644 --- a/addons/autolink/autolink.js +++ b/addons/autolink/autolink.js @@ -24,7 +24,7 @@ var thisPlugin = this; // extract target text nodes - this.extractTargets($('.xe_content')); + this.extractTargets($('.rhymix_content, .xe_content')); $(this.targets).each(function(){ thisPlugin.cast('AUTOLINK', [this]); @@ -63,7 +63,7 @@ }, extractTargets : function(obj) { var thisPlugin = this; - var wrap = $('.xe_content', obj); + var wrap = $('.rhymix_content, .xe_content', obj); if(wrap.length) { this.extractTargets(wrap); return; @@ -93,7 +93,7 @@ xe.registerPlugin(new AutoLink()); - $(document).on('click', '.xe_content a', function() { + $(document).on('click', '.rhymix_content a, .xe_content a', function() { if (!$(this).attr("target")) { $(this).attr("target", "_blank"); } diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html index 103795949..8fb86fe2e 100644 --- a/addons/autolink/autolink.spec.html +++ b/addons/autolink/autolink.spec.html @@ -82,7 +82,7 @@ describe('Autolink trigger', { // ]]> -