WordPress.org
Get WordPress

Make WordPress Core

Changeset 26217


Ignore:
Timestamp:
11/15/2013 07:01:00 PM (12 years ago)
Author:
lancewillett
Message:

Twenty Fourteen: remove main-content element where not necessary, props iamtakashi. See #25946.

Location:
trunk/src/wp-content/themes/twentyfourteen
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-content/themes/twentyfourteen/404.php

    r25985 r26217  
    1010get_header(); ?>
    1111
    12 <div id="main-content" class="main-content">
     12
    1313    <div id="primary" class="content-area">
    1414        <div id="content" class="site-content" role="main">
    … …  
    2626        </div><!-- #content -->
    2727    </div><!-- #primary -->
    28     <?php get_sidebar( 'content' ); ?>
    29 </div><!-- #main-content -->
    3028
    3129<?php
     30get_sidebar( 'content' );
    3231get_sidebar();
    3332get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/archive.php

    r25985 r26217  
    2020get_header(); ?>
    2121
    22 <div id="main-content" class="main-content">
    2322    <section id="primary" class="content-area">
    2423        <div id="content" class="site-content" role="main">
    … …  
    6160        </div><!-- #content -->
    6261    </section><!-- #primary -->
    63     <?php get_sidebar( 'content' ); ?>
    64 </div><!-- #main-content -->
    6562
    6663<?php
     64get_sidebar( 'content' );
    6765get_sidebar();
    6866get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/category.php

    r25985 r26217  
    1212get_header(); ?>
    1313
    14 <div id="main-content" class="main-content">
    1514    <section id="primary" class="content-area">
    1615        <div id="content" class="site-content" role="main">
    … …  
    4544        </div><!-- #content -->
    4645    </section><!-- #primary -->
    47     <?php get_sidebar( 'content' ); ?>
    48 </div><!-- #main-content -->
    4946
    5047<?php
     48get_sidebar( 'content' );
    5149get_sidebar();
    5250get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/functions.php

    r26152 r26217  
    218218 */
    219219function twentyfourteen_scripts() {
     220    global $wp_styles;
     221
    220222    // Add Lato font, used in the main stylesheet.
    221223    wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
    … …  
    229231    // Load the Internet Explorer specific stylesheet.
    230232    wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
    231     wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
     233    $wp_styles->add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
    232234
    233235    if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )

  • trunk/src/wp-content/themes/twentyfourteen/image.php

    r25985 r26217  
    1313?>
    1414
    15 <div id="main-content" class="main-content">
    1615    <section id="primary" class="content-area image-attachment">
    1716        <div id="content" class="site-content" role="main">
    … …  
    8685        </div><!-- #content -->
    8786    </section><!-- #primary -->
    88 </div><!-- #main-content -->
    8987
    9088<?php

  • trunk/src/wp-content/themes/twentyfourteen/search.php

    r25985 r26217  
    1010get_header(); ?>
    1111
    12 <div id="main-content" class="main-content">
    1312    <section id="primary" class="content-area">
    1413        <div id="content" class="site-content" role="main">
    … …  
    3635        </div><!-- #content -->
    3736    </section><!-- #primary -->
    38     <?php get_sidebar( 'content' ); ?>
    39 </div><!-- #main-content -->
    4037
    4138<?php
     39get_sidebar( 'content' );
    4240get_sidebar();
    4341get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/single.php

    r25985 r26217  
    1010get_header(); ?>
    1111
    12 <div id="main-content" class="main-content">
    1312    <div id="primary" class="content-area">
    1413        <div id="content" class="site-content" role="main">
    … …  
    2827        </div><!-- #content -->
    2928    </div><!-- #primary -->
    30     <?php get_sidebar( 'content' ); ?>
    31 </div><!-- #main-content -->
    3229
    3330<?php
     31get_sidebar( 'content' );
    3432get_sidebar();
    3533get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/tag.php

    r26030 r26217  
    1414get_header(); ?>
    1515
    16 <div id="main-content" class="main-content">
    1716    <section id="primary" class="content-area">
    1817        <div id="content" class="site-content" role="main">
    … …  
    4746        </div><!-- #content -->
    4847    </section><!-- #primary -->
    49     <?php get_sidebar( 'content' ); ?>
    50 </div><!-- #main-content -->
    5148
    5249<?php
     50get_sidebar( 'content' );
    5351get_sidebar();
    5452get_footer();

  • trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php

    r26030 r26217  
    1616get_header(); ?>
    1717
    18 <div id="main-content" class="main-content">
    1918    <section id="primary" class="content-area">
    2019        <div id="content" class="site-content" role="main">
    … …  
    6968        </div><!-- #content -->
    7069    </section><!-- #primary -->
    71     <?php get_sidebar( 'content' ); ?>
    72 </div><!-- #main-content -->
    7370
    7471<?php
     72get_sidebar( 'content' );
    7573get_sidebar();
    7674get_footer();
Note: See TracChangeset for help on using the changeset viewer.