Skip to content

Commit 67c394c

Browse files
author
Jose Pardilla
committed
1 parent 367e2c5 commit 67c394c

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

fancybox.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,11 +418,11 @@ function mfbfw_admin_menu() {
418418

419419
function mfbfw_admin_styles() {
420420
wp_enqueue_style( 'fancybox-admin', FBFW_URL . 'css/fancybox-admin.css', false, FBFW_VERSION ); // Load custom CSS for Admin Page
421-
wp_enqueue_style( 'farbtastic' );
421+
wp_enqueue_style( 'wp-color-picker' );
422422
}
423423

424424
function mfbfw_admin_scripts() {
425-
wp_enqueue_script( 'fancybox-admin', FBFW_URL . 'js/admin.js', array('jquery', 'farbtastic'), FBFW_VERSION ); // Load specific JS for Admin Page
425+
wp_enqueue_script( 'fancybox-admin', FBFW_URL . 'js/admin.js', array('jquery', 'wp-color-picker'), FBFW_VERSION ); // Load specific JS for Admin Page
426426
}
427427

428428

js/admin.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jQuery(function (){
8686
});
8787

8888

89-
// Color Picker
89+
/* Color Picker
9090
var $color_inputs = jQuery("input.mfbfw_colorpicker");
9191
$color_inputs.each(function () {
9292
var $input = jQuery(this);
@@ -96,6 +96,9 @@ jQuery(function (){
9696
jQuery($pickerId).animate({opacity: "toggle", height: "toggle"}, 500)
9797
});
9898
});
99+
*/
100+
101+
jQuery('.mfbfw_colorpicker').wpColorPicker();
99102

100103
})
101104

lib/admin-tab-appearance.php

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
<div id="borderColorBlock">
1919

2020
<label for="borderColor">
21-
<input type="text" name="mfbfw[borderColor]" id="borderColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['borderColor'] ?>" size="7" maxlength="7" />
22-
<?php _e('HTML color of the border (default: #BBBBBB)', 'mfbfw'); ?>
23-
<div id="borderColor_picker" class="color-picker" style="display:none"></div>
21+
<input type="text" name="mfbfw[borderColor]" id="borderColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['borderColor'] ?>" size="7" maxlength="7" data-default-color="#BBBBBB" />
2422
</label><br /><br />
2523

2624
</div>
@@ -74,11 +72,8 @@
7472
<fieldset>
7573

7674
<label for="paddingColor">
77-
<input type="text" name="mfbfw[paddingColor]" id="paddingColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['paddingColor'] ?>" size="7" maxlength="7" />
78-
<?php _e('Padding HTML color (default: #FFFFFF)', 'mfbfw'); ?>
79-
<div id="paddingColor_picker" class="color-picker" style="display:none"></div>
75+
<input type="text" name="mfbfw[paddingColor]" id="paddingColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['paddingColor'] ?>" size="7" maxlength="7" data-default-color="#FFFFFF" />
8076
</label><br />
81-
8277
<small><em><?php _e('(This should be left on #FFFFFF (white) if you want to display anything other than images, like inline or framed content)', 'mfbfw'); ?></em></small><br /><br />
8378

8479
<label for="padding">
@@ -113,9 +108,7 @@
113108
<div id="overlayBlock">
114109

115110
<label for="overlayColor">
116-
<input type="text" name="mfbfw[overlayColor]" id="overlayColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['overlayColor']; ?>" size="7" maxlength="7" />
117-
<?php _e('Overlay HTML color (default: #000000)', 'mfbfw'); ?>
118-
<div id="overlayColor_picker" class="color-picker" style="display:none"></div>
111+
<input type="text" name="mfbfw[overlayColor]" id="overlayColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['overlayColor']; ?>" size="7" maxlength="7" data-default-color="#000000" />
119112
</label><br /><br />
120113

121114
<label for="overlayOpacity">
@@ -199,11 +192,8 @@
199192
<div id="titleColorBlock">
200193

201194
<label for="titleColor">
202-
<input type="text" name="mfbfw[titleColor]" id="titleColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['titleColor']; ?>" size="7" maxlength="7" />
203-
<?php _e('Title text color (default: #333333)', 'mfbfw'); ?>
204-
<div id="titleColor_picker" class="color-picker" style="display:none"></div>
195+
<input type="text" name="mfbfw[titleColor]" id="titleColor" class="mfbfw_colorpicker" value="<?php echo $mfbfw['titleColor']; ?>" size="7" maxlength="7" data-default-color="#333333" />
205196
</label><br />
206-
207197
<small><em><?php _e('(Should contrast with the padding color set above)', 'mfbfw'); ?></em></small><br /><br />
208198

209199
</div>

0 commit comments

Comments
 (0)