golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Twenty Eleven: theme options - see #17198 

* Make color swatch clickable to open palette
 * Change color picker link to a submit button to match existing UI

git-svn-id: http://svn.automattic.com/wordpress/trunk@17754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
lancewillett 2011-04-28 19:01:51 +00:00
parent 7f9f067e60
commit a87ba1d261
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-content/themes/twentyeleven/inc/theme-options.css
View File

@ -21,11 +21,10 @@
margin: 0 0 0 -2px;
}
#link-color-example {
padding: 4px 14px;
margin: 0 7px 0 3px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
border: 1px solid #dfdfdf;
margin: 0 7px 0 3px;
padding: 4px 14px;
}

4
wp-content/themes/twentyeleven/inc/theme-options.js
View File

@ -5,14 +5,14 @@ var farbtastic;
farbtastic.setColor(a);
$('#link-color').val(a);
$('#link-color-example').css('background-color', a);
}
};
$(document).ready( function() {
farbtastic = $.farbtastic('#colorPickerDiv', pickColor);
pickColor( $('#link-color').val() );
$('#pickcolor').click( function(e) {
$('.pickcolor').click( function(e) {
$('#colorPickerDiv').show();
e.preventDefault();
});

5
wp-content/themes/twentyeleven/inc/theme-options.php
View File

@ -192,7 +192,8 @@ function theme_options_render_page() {
<td>
<fieldset><legend class="screen-reader-text"><span><?php _e( 'Link Color', 'twentyeleven' ); ?></span></legend>
<input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
<span id="link-color-example"></span> <a class="hide-if-no-js" href="#" id="pickcolor"><?php _e( 'Select a Color', 'twentyeleven' ); ?></a>
<a href="#" class="pickcolor hide-if-no-js" id="link-color-example"></a>
<input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>">
<div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
<br />
<small class="description"><?php printf( __( 'Default color: %s', 'twentyeleven' ), $default_options['link_color'] ); ?></small>
@ -283,7 +284,7 @@ function twentyeleven_print_link_color_style() {
$link_color = $options['link_color'];
$default_options = twentyeleven_get_default_theme_options();
// Don't do anything if the current link color is the default.
if ( $default_options['link_color'] == $link_color )
return;