Move files in inc/theme-options up one level. see #17198.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
|
@ -88,7 +88,7 @@ function twentyeleven_setup() {
|
||||||
/**
|
/**
|
||||||
* Load up our theme options page
|
* Load up our theme options page
|
||||||
*/
|
*/
|
||||||
require( dirname( __FILE__ ) . '/inc/theme-options/theme-options.php' );
|
require( dirname( __FILE__ ) . '/inc/theme-options.php' );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Grab Twenty Eleven's Custom Widgets
|
* Grab Twenty Eleven's Custom Widgets
|
||||||
|
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 273 B |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
@ -21,8 +21,8 @@ function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
|
||||||
if ( $hook_suffix != 'appearance_page_theme_options' )
|
if ( $hook_suffix != 'appearance_page_theme_options' )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options/theme-options.css', '', '0.1' );
|
wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', '', '0.1' );
|
||||||
wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options/theme-options.js' );
|
wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js' );
|
||||||
wp_enqueue_style( 'farbtastic' );
|
wp_enqueue_style( 'farbtastic' );
|
||||||
wp_enqueue_script( 'farbtastic' );
|
wp_enqueue_script( 'farbtastic' );
|
||||||
}
|
}
|
||||||
|
@ -83,12 +83,12 @@ function twentyeleven_color_schemes() {
|
||||||
'light' => array(
|
'light' => array(
|
||||||
'value' => 'light',
|
'value' => 'light',
|
||||||
'label' => __( 'Light', 'twentyeleven' ),
|
'label' => __( 'Light', 'twentyeleven' ),
|
||||||
'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/light.png',
|
'thumbnail' => get_template_directory_uri() . '/inc/images/light.png',
|
||||||
),
|
),
|
||||||
'dark' => array(
|
'dark' => array(
|
||||||
'value' => 'dark',
|
'value' => 'dark',
|
||||||
'label' => __( 'Dark', 'twentyeleven' ),
|
'label' => __( 'Dark', 'twentyeleven' ),
|
||||||
'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/dark.png',
|
'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -105,17 +105,17 @@ function twentyeleven_layouts() {
|
||||||
'content-sidebar' => array(
|
'content-sidebar' => array(
|
||||||
'value' => 'content-sidebar',
|
'value' => 'content-sidebar',
|
||||||
'label' => __( 'Content on left', 'twentyeleven' ),
|
'label' => __( 'Content on left', 'twentyeleven' ),
|
||||||
'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/content-sidebar.png',
|
'thumbnail' => get_template_directory_uri() . '/inc/images/content-sidebar.png',
|
||||||
),
|
),
|
||||||
'sidebar-content' => array(
|
'sidebar-content' => array(
|
||||||
'value' => 'sidebar-content',
|
'value' => 'sidebar-content',
|
||||||
'label' => __( 'Content on right', 'twentyeleven' ),
|
'label' => __( 'Content on right', 'twentyeleven' ),
|
||||||
'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/sidebar-content.png',
|
'thumbnail' => get_template_directory_uri() . '/inc/images/sidebar-content.png',
|
||||||
),
|
),
|
||||||
'content' => array(
|
'content' => array(
|
||||||
'value' => 'content',
|
'value' => 'content',
|
||||||
'label' => __( 'One-column, no Sidebar', 'twentyeleven' ),
|
'label' => __( 'One-column, no Sidebar', 'twentyeleven' ),
|
||||||
'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/content.png',
|
'thumbnail' => get_template_directory_uri() . '/inc/images/content.png',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|