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

bootstrap.css -> bootstrap.min.js

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12443 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-12-20 07:49:18 +00:00
parent b2bf60df28
commit 8c4dc00700
12 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/communication/skins/default/send_message.html
View file

@ -1,5 +1,5 @@
<load target="js/communication.js" />
<load target="../../../../common/css/bootstrap.css" />
<load target="../../../../common/css/bootstrap.min.css" />
<div class="x_page-header">
<h1>{$lang->cmd_send_message}</h1>

2
modules/editor/components/emoticon/tpl/popup.css
View file

@ -1,5 +1,5 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.css);
@import url(../../../../../common/css/bootstrap.min.css);
img.emoticon{ margin:10px 10px 0 0; cursor:pointer}
#emoticons{padding:0 10px 20px 10px}

2
modules/editor/components/image_gallery/tpl/popup.css
View file

@ -1,6 +1,6 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.css);
@import url(../../../../../common/css/bootstrap.min.css);
li { float:left; list-style:none; margin-right:5px; }
img.bg_preview_color {

3
modules/editor/components/image_gallery/tpl/popup.min.css vendored
View file

@ -3,4 +3,5 @@
* @brief Slideshow type image gallery plugin
* @author NHN (developers@xpressengine.com)
**/
@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";@import url(../../../../../common/css/bootstrap.css);li{float:left;list-style:none;margin-right:5px}img.bg_preview_color{width:30px;height:16px;border:1px solid #000000;background-color:#FFFFFF}img.border_preview_color{width:30px;height:16px;border:1px solid #EEEEEE;background-color:#000000}img.color_icon{width:14px;height:14px;border:1px solid #FFFFFF}img.color_icon_over{width:14px;height:14px;border:1px solid #000000;cursor:pointer}.editor_color_box{clear:both;height:65px;width:400px;border:1px solid #DDDDDD;padding:2px}.image_list{width:100%;border:1px solid #EEEEEE;height:200px !important}
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);@import url(../../../../../common/css/bootstrap.min.css);li{float:left;list-style:none;margin-right:5px}img.bg_preview_color{width:30px;height:16px;border:1px solid #000000;background-color:#FFFFFF}img.border_preview_color{width:30px;height:16px;border:1px solid #EEEEEE;background-color:#000000}img.color_icon{width:14px;height:14px;border:1px solid #FFFFFF}img.color_icon_over{width:14px;height:14px;border:1px solid #000000;cursor:pointer}.editor_color_box{clear:both;height:65px;width:400px;border:1px solid #DDDDDD;padding:2px}.image_list{width:100%;border:1px solid #EEEEEE;height:200px !important}

2
modules/editor/components/image_link/tpl/popup.css
View file

@ -1,6 +1,6 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.css);
@import url(../../../../../common/css/bootstrap.min.css);
.image_align {
margin:0px 0px 5px 0px;

2
modules/editor/components/multimedia_link/tpl/popup.css
View file

@ -1,4 +1,4 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.css);
@import url(../../../../../common/css/bootstrap.min.css);

2
modules/editor/components/poll_maker/tpl/popup.css
View file

@ -1,6 +1,6 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.css);
@import url(../../../../../common/css/bootstrap.min.css);
.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; font-family:tahoma; }

2
modules/editor/tpl/view_component.html
View file

@ -1,6 +1,6 @@
<load target="css/editor.css" usecdn="true" />
<load target="../../../modules/admin/tpl/css/admin.css" usecdn="true" />
<load target="../../../common/css/bootstrap.css" usecdn="true" />
<load target="../../../common/css/bootstrap.min.css" usecdn="true" />
<section class="section">
<h1>{$component->title} ver. {$component->version}</h1>

4
modules/member/skins/default/css/member.css
View file

@ -5,7 +5,7 @@
.xm input,
.xm textarea,
.xm select,
.xm button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333}
.xm button{font-family:Tahoma,Geneva,sans-serif;font-size:13px;color:#333}
.xm button,
.xm input[type=submit],
.xm input[type=reset],
@ -114,5 +114,5 @@
.xm button.text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a;background:none;text-decoration:underline}
/* Agreement */
.xm .agreement{margin:1em 0}
.xm .agreement .text{height:200px;overflow:auto;margin:1em 0}
.xm .agreement .text{max-height:200px;overflow:auto;margin:1em 0}
.xm .agreement .confirm{margin:1em 0}

7
modules/member/skins/default/signup_form.html
View file

@ -1,3 +1,4 @@
<load target="../../../../common/css/bootstrap.min.css" />
<load target="../../tpl/js/signup_check.js" />
<!--// datepicker javascript plugin load -->
<!--%load_js_plugin("ui")-->
@ -14,8 +15,10 @@
{$member_config->agreement}
</div>
<div class="confirm">
<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
<label for="accept_agree">{$lang->about_accept_agreement}</label>
<label for="accept_agree">
<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
{$lang->about_accept_agreement}
</label>
</div>
</div>
<ul>

2
modules/module/tpl/module_selector.html
View file

@ -1,5 +1,5 @@
<load target="./js/module_admin.js" usecdn="true" />
<load target="../../../common/css/bootstrap.css" usecdn="true" />
<load target="../../../common/css/bootstrap.min.css" usecdn="true" />
<div class="x_page-header">
<h1>{$lang->module_selector}</h1>

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

@ -1,6 +1,6 @@
<load target="../../admin/tpl/js/admin.js" usecdn="true" />
<load target="../../admin/tpl/css/admin.css" usecdn="true" />
<load target="../../../common/css/bootstrap.css" usecdn="true" />
<load target="../../../common/css/bootstrap.min.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
<load target="css/widget.css" usecdn="true" />