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

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
akasima 2014-05-08 13:39:08 +09:00
commit fd5db27fcd
6 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/js/x.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
modules/admin/tpl/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
modules/editor/tpl/js/uploader.min.js vendored
View file

File diff suppressed because one or more lines are too long

20
modules/widget/tpl/js/widget.js
View file

@ -664,16 +664,20 @@ function doShowWidgetSizeSetup(px, py, obj) {
jQuery.each(opts, function(key, val){
var el = form[0].elements[key];
if (el)
{
el.value = val;
if(el.className.match(/\bcolor-indicator\b/))
{
el.style.background = el.value = '#'+el.value;
var $el = jQuery(el);
if(el) {
$el.val(val);
if($el.hasClass('color-indicator')) {
if(val != 'transparent') {
val = val.toUpperCase();
$el.css('background', '#' + val);
$el.val('#' + val);
}
}
}
if (el.tagName.toLowerCase() == "select")
{
if(el.tagName.toLowerCase() == "select") {
if(el.selectedIndex == -1) {
el.selectedIndex = 0;
}

2
modules/widget/tpl/js/widget.min.js vendored
View file

File diff suppressed because one or more lines are too long

10
modules/widget/tpl/widget_layer.html
View file

@ -62,7 +62,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="6"/>
<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="7"/>
</td>
</tr>
<tr>
@ -72,7 +72,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="6"/>
<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="7"/>
</td>
<td style="text-align:right">
<input type="number" name="border_right_thick" value="" class="small_input" /> px
@ -80,7 +80,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="6"/>
<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="7"/>
</td>
</tr>
<tr>
@ -90,7 +90,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="6"/>
<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="7"/>
</td>
</tr>
<tr>
@ -126,7 +126,7 @@
<style scoped>
.wgs{margin:0;width:700px}
.wgs select{margin:0;width:auto}
.wgs input{margin:0!important;width:50px}
.wgs input{margin:0!important;width:60px}
</style>
</section>
<!--%load_js_plugin("ui.colorpicker")-->