mirror of
https://github.com/WordPress/WordPress.git
synced 2024-10-01 00:27:38 +02:00
Twenty Fourteen: remove main-content
element where not necessary, props iamtakashi. See #25946.
Built from https://develop.svn.wordpress.org/trunk@26217 git-svn-id: http://core.svn.wordpress.org/trunk@26125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
1832d880a5
commit
c3bd52a52f
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<div id="primary" class="content-area">
|
<div id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -25,9 +25,8 @@ get_header(); ?>
|
|||||||
|
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</div><!-- #primary -->
|
</div><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area">
|
<section id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -60,9 +59,8 @@ get_header(); ?>
|
|||||||
?>
|
?>
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area">
|
<section id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -44,9 +43,8 @@ get_header(); ?>
|
|||||||
?>
|
?>
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
@ -217,6 +217,8 @@ function twentyfourteen_font_url() {
|
|||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function twentyfourteen_scripts() {
|
function twentyfourteen_scripts() {
|
||||||
|
global $wp_styles;
|
||||||
|
|
||||||
// Add Lato font, used in the main stylesheet.
|
// Add Lato font, used in the main stylesheet.
|
||||||
wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
|
wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
|
||||||
|
|
||||||
@ -228,7 +230,7 @@ function twentyfourteen_scripts() {
|
|||||||
|
|
||||||
// Load the Internet Explorer specific stylesheet.
|
// Load the Internet Explorer specific stylesheet.
|
||||||
wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
|
wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
|
||||||
wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
|
$wp_styles->add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
|
||||||
|
|
||||||
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
|
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
|
||||||
wp_enqueue_script( 'comment-reply' );
|
wp_enqueue_script( 'comment-reply' );
|
||||||
|
@ -12,7 +12,6 @@ $metadata = wp_get_attachment_metadata();
|
|||||||
get_header();
|
get_header();
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area image-attachment">
|
<section id="primary" class="content-area image-attachment">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -85,7 +84,6 @@ get_header();
|
|||||||
|
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area">
|
<section id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -35,10 +34,9 @@ get_header(); ?>
|
|||||||
|
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<div id="primary" class="content-area">
|
<div id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
<?php
|
<?php
|
||||||
@ -27,9 +26,8 @@ get_header(); ?>
|
|||||||
?>
|
?>
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</div><!-- #primary -->
|
</div><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area">
|
<section id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -46,9 +45,8 @@ get_header(); ?>
|
|||||||
?>
|
?>
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="main-content" class="main-content">
|
|
||||||
<section id="primary" class="content-area">
|
<section id="primary" class="content-area">
|
||||||
<div id="content" class="site-content" role="main">
|
<div id="content" class="site-content" role="main">
|
||||||
|
|
||||||
@ -68,9 +67,8 @@ get_header(); ?>
|
|||||||
?>
|
?>
|
||||||
</div><!-- #content -->
|
</div><!-- #content -->
|
||||||
</section><!-- #primary -->
|
</section><!-- #primary -->
|
||||||
<?php get_sidebar( 'content' ); ?>
|
|
||||||
</div><!-- #main-content -->
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
get_sidebar( 'content' );
|
||||||
get_sidebar();
|
get_sidebar();
|
||||||
get_footer();
|
get_footer();
|
||||||
|
Loading…
Reference in New Issue
Block a user