From c9c02be3549fda6598220902010a78136db7bae6 Mon Sep 17 00:00:00 2001 From: Ian Stewart Date: Mon, 1 Dec 2014 19:41:22 +0000 Subject: [PATCH] Twenty Fifteen: correct stylesheet dependencies. Props ocean90, fixes #30532. Built from https://develop.svn.wordpress.org/trunk@30692 git-svn-id: http://core.svn.wordpress.org/trunk@30682 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/functions.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index 04edcc97a5..d9e1f14cdd 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -213,10 +213,10 @@ function twentyfifteen_scripts() { wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.2' ); // Load our main stylesheet. - wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri() ); + wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array( 'twentyfifteen-fonts', 'genericons' ) ); // Load the Internet Explorer specific stylesheet. - wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style', 'genericons' ), '20141010' ); + wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20141010' ); wp_style_add_data( 'twentyfifteen-ie', 'conditional', 'lt IE 9' ); // Load the Internet Explorer 7 specific stylesheet. diff --git a/wp-includes/version.php b/wp-includes/version.php index d058b92e1b..6b1c2afb74 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30691'; +$wp_version = '4.1-beta2-30692'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.