Changeset 25985
- Timestamp:
- 10/29/2013 07:05:02 PM (7 years ago)
- Location:
- trunk/src/wp-content/themes/twentyfourteen
- Files:
-
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-content/themes/twentyfourteen/404.php
r25769 r25985 10 10 get_header(); ?> 11 11 12 <div id="main-content" class="main-content"> 12 13 <div id="primary" class="content-area"> 13 14 <div id="content" class="site-content" role="main"> … … 25 26 </div><!-- #content --> 26 27 </div><!-- #primary --> 28 <?php get_sidebar( 'content' ); ?> 29 </div><!-- #main-content --> 27 30 28 31 <?php 29 get_sidebar( 'content' );30 32 get_sidebar(); 31 33 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/archive.php
r25769 r25985 20 20 get_header(); ?> 21 21 22 <div id="main-content" class="main-content"> 22 23 <section id="primary" class="content-area"> 23 24 <div id="content" class="site-content" role="main"> … … 60 61 </div><!-- #content --> 61 62 </section><!-- #primary --> 63 <?php get_sidebar( 'content' ); ?> 64 </div><!-- #main-content --> 62 65 63 66 <?php 64 get_sidebar( 'content' );65 67 get_sidebar(); 66 68 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/category.php
r25769 r25985 12 12 get_header(); ?> 13 13 14 <div id="main-content" class="main-content"> 14 15 <section id="primary" class="content-area"> 15 16 <div id="content" class="site-content" role="main"> … … 44 45 </div><!-- #content --> 45 46 </section><!-- #primary --> 47 <?php get_sidebar( 'content' ); ?> 48 </div><!-- #main-content --> 46 49 47 50 <?php 48 get_sidebar( 'content' );49 51 get_sidebar(); 50 52 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/contributor-page.php
r25769 r25985 9 9 10 10 get_header(); ?> 11 12 <div id="main-content" class="main-content"> 13 14 <?php 15 if ( is_front_page() && twentyfourteen_has_featured_posts() ) 16 get_template_part( 'featured-content' ); 17 ?> 11 18 12 19 <div id="primary" class="content-area"> … … 35 42 </div><!-- #content --> 36 43 </div><!-- #primary --> 44 </div><!-- #main-content --> 37 45 38 46 <?php -
trunk/src/wp-content/themes/twentyfourteen/full-width-page.php
r25769 r25985 9 9 10 10 get_header(); ?> 11 12 <div id="main-content" class="main-content"> 13 14 <?php 15 if ( is_front_page() && twentyfourteen_has_featured_posts() ) 16 get_template_part( 'featured-content' ); 17 ?> 11 18 12 19 <div id="primary" class="content-area"> … … 25 32 </div><!-- #content --> 26 33 </div><!-- #primary --> 34 </div><!-- #main-content --> 27 35 28 36 <?php -
trunk/src/wp-content/themes/twentyfourteen/image.php
r25769 r25985 13 13 ?> 14 14 15 <section id="primary" class="content-area image-attachment"> 16 <div id="content" class="site-content" role="main"> 15 <div id="main-content" class="main-content"> 16 <section id="primary" class="content-area image-attachment"> 17 <div id="content" class="site-content" role="main"> 17 18 18 <?php while ( have_posts() ) : the_post(); ?>19 <?php while ( have_posts() ) : the_post(); ?> 19 20 20 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>21 <header class="entry-header">22 <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>21 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> 22 <header class="entry-header"> 23 <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?> 23 24 24 <div class="entry-meta">25 <div class="entry-meta"> 25 26 26 <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>27 <span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span> 27 28 28 <span class="full-size-link"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $metadata['width']; ?> × <?php echo $metadata['height']; ?></a></span>29 <span class="full-size-link"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $metadata['width']; ?> × <?php echo $metadata['height']; ?></a></span> 29 30 30 <span class="parent-post-link"><a href="<?php echo get_permalink( $post->post_parent ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>31 <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>32 </div><!-- .entry-meta -->33 </header><!-- .entry-header -->31 <span class="parent-post-link"><a href="<?php echo get_permalink( $post->post_parent ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span> 32 <?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?> 33 </div><!-- .entry-meta --> 34 </header><!-- .entry-header --> 34 35 35 <div class="entry-content">36 <div class="entry-attachment">37 <div class="attachment">38 <?php twentyfourteen_the_attached_image(); ?>39 </div><!-- .attachment -->36 <div class="entry-content"> 37 <div class="entry-attachment"> 38 <div class="attachment"> 39 <?php twentyfourteen_the_attached_image(); ?> 40 </div><!-- .attachment --> 40 41 41 <?php if ( has_excerpt() ) : ?>42 <div class="entry-caption">43 <?php the_excerpt(); ?>44 </div><!-- .entry-caption -->45 <?php endif; ?>46 </div><!-- .entry-attachment -->42 <?php if ( has_excerpt() ) : ?> 43 <div class="entry-caption"> 44 <?php the_excerpt(); ?> 45 </div><!-- .entry-caption --> 46 <?php endif; ?> 47 </div><!-- .entry-attachment --> 47 48 48 <?php49 the_content();50 wp_link_pages( array(51 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',52 'after' => '</div>',53 'link_before' => '<span>',54 'link_after' => '</span>',55 ) );56 ?>57 </div><!-- .entry-content -->49 <?php 50 the_content(); 51 wp_link_pages( array( 52 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>', 53 'after' => '</div>', 54 'link_before' => '<span>', 55 'link_after' => '</span>', 56 ) ); 57 ?> 58 </div><!-- .entry-content --> 58 59 59 <footer class="entry-meta">60 <?php61 if ( comments_open() && pings_open() ) : // Comments and trackbacks open62 printf( __( '<a class="comment-link" href="#respond">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );63 elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open64 printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() );65 elseif ( comments_open() && ! pings_open() ) : // Only comments open66 _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond">post a comment</a>.', 'twentyfourteen' );67 elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed68 _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' );69 endif;70 ?>71 </footer><!-- .entry-meta -->72 </article><!-- #post-## -->60 <footer class="entry-meta"> 61 <?php 62 if ( comments_open() && pings_open() ) : // Comments and trackbacks open 63 printf( __( '<a class="comment-link" href="#respond">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() ); 64 elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open 65 printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" rel="trackback">Trackback URL</a>.', 'twentyfourteen' ), get_trackback_url() ); 66 elseif ( comments_open() && ! pings_open() ) : // Only comments open 67 _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond">post a comment</a>.', 'twentyfourteen' ); 68 elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed 69 _e( 'Both comments and trackbacks are currently closed.', 'twentyfourteen' ); 70 endif; 71 ?> 72 </footer><!-- .entry-meta --> 73 </article><!-- #post-## --> 73 74 74 <nav id="image-navigation" class="navigation image-navigation">75 <div class="nav-links">76 <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>77 <?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?>78 </div><!-- .nav-links -->79 </nav><!-- #image-navigation -->75 <nav id="image-navigation" class="navigation image-navigation"> 76 <div class="nav-links"> 77 <?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?> 78 <?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?> 79 </div><!-- .nav-links --> 80 </nav><!-- #image-navigation --> 80 81 81 <?php comments_template(); ?>82 <?php comments_template(); ?> 82 83 83 <?php endwhile; // end of the loop. ?>84 <?php endwhile; // end of the loop. ?> 84 85 85 </div><!-- #content --> 86 </section><!-- #primary --> 86 </div><!-- #content --> 87 </section><!-- #primary --> 88 </div><!-- #main-content --> 87 89 88 90 <?php -
trunk/src/wp-content/themes/twentyfourteen/index.php
r25769 r25985 15 15 16 16 get_header(); ?> 17 18 <div id="main-content" class="main-content"> 19 20 <?php 21 if ( is_front_page() && twentyfourteen_has_featured_posts() ) 22 get_template_part( 'featured-content' ); 23 ?> 17 24 18 25 <div id="primary" class="content-area"> … … 36 43 </div><!-- #content --> 37 44 </div><!-- #primary --> 45 <?php get_sidebar( 'content' ); ?> 46 </div><!-- #main-content --> 38 47 39 48 <?php 40 get_sidebar( 'content' );41 49 get_sidebar(); 42 50 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/page.php
r25769 r25985 14 14 get_header(); ?> 15 15 16 <div id="main-content" class="main-content"> 17 18 <?php 19 if ( is_front_page() && twentyfourteen_has_featured_posts() ) 20 get_template_part( 'featured-content' ); 21 ?> 16 22 <div id="primary" class="content-area"> 17 23 <div id="content" class="site-content" role="main"> … … 31 37 </div><!-- #content --> 32 38 </div><!-- #primary --> 39 <?php get_sidebar( 'content' ); ?> 40 </div><!-- #main-content --> 33 41 34 42 <?php 35 get_sidebar( 'content' );36 43 get_sidebar(); 37 44 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/search.php
r25769 r25985 10 10 get_header(); ?> 11 11 12 <div id="main-content" class="main-content"> 12 13 <section id="primary" class="content-area"> 13 14 <div id="content" class="site-content" role="main"> … … 35 36 </div><!-- #content --> 36 37 </section><!-- #primary --> 38 <?php get_sidebar( 'content' ); ?> 39 </div><!-- #main-content --> 37 40 38 41 <?php 39 get_sidebar( 'content' );40 42 get_sidebar(); 41 43 get_footer(); 44 -
trunk/src/wp-content/themes/twentyfourteen/single.php
r25769 r25985 10 10 get_header(); ?> 11 11 12 <div id="primary" class="content-area"> 13 <div id="content" class="site-content" role="main"> 14 <?php 15 while ( have_posts() ) : 16 the_post(); 12 <div id="main-content" class="main-content"> 13 <div id="primary" class="content-area"> 14 <div id="content" class="site-content" role="main"> 15 <?php 16 while ( have_posts() ) : 17 the_post(); 17 18 18 get_template_part( 'content', get_post_format() );19 get_template_part( 'content', get_post_format() ); 19 20 20 twentyfourteen_post_nav();21 twentyfourteen_post_nav(); 21 22 22 // If comments are open or we have at least one comment, load up the comment template. 23 if ( comments_open() || get_comments_number() ) 24 comments_template(); 25 endwhile; 26 ?> 27 </div><!-- #content --> 28 </div><!-- #primary --> 23 // If comments are open or we have at least one comment, load up the comment template. 24 if ( comments_open() || get_comments_number() ) 25 comments_template(); 26 endwhile; 27 ?> 28 </div><!-- #content --> 29 </div><!-- #primary --> 30 <?php get_sidebar( 'content' ); ?> 31 </div><!-- #main-content --> 29 32 30 33 <?php 31 get_sidebar( 'content' );32 34 get_sidebar(); 33 35 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/style.css
r25980 r25985 13 13 Use it to make something cool, have fun, and share what you've learned with others. 14 14 */ 15 16 15 17 16 /** … … 35 34 * 6.9 - Contributor Page 36 35 * 6.10 - 404 Page 37 * 6.11 - Front Page 38 * 6.12 - Full-width 39 * 6.13 - Comments 36 * 6.11 - Full-width 37 * 6.12 - Comments 40 38 * 7.0 - Sidebar 41 39 * 7.1 - Widgets … … 771 769 } 772 770 771 .main-content { 772 width: 100%; 773 } 774 773 775 774 776 /** … … 1722 1724 1723 1725 /** 1724 * 6.11 Front Page 1725 * ----------------------------------------------------------------------------- 1726 */ 1727 1728 .front-page-content-wrapper { 1729 width: 100%; 1730 } 1731 1732 1733 /** 1734 * 6.12 Full-width 1726 * 6.11 Full-width 1735 1727 * ----------------------------------------------------------------------------- 1736 1728 */ … … 1755 1747 1756 1748 /** 1757 * 6.1 3Comments1749 * 6.12 Comments 1758 1750 * ----------------------------------------------------------------------------- 1759 1751 */ … … 3242 3234 .search-box-wrapper { 3243 3235 padding-left: 182px; 3236 } 3237 3238 .main-content { 3239 float: left; 3244 3240 } 3245 3241 … … 3378 3374 } 3379 3375 3380 .front-page-content-wrapper {3381 float: left;3382 }3383 3384 3376 .featured-content { 3385 3377 padding-left: 182px; -
trunk/src/wp-content/themes/twentyfourteen/tag.php
r25769 r25985 14 14 get_header(); ?> 15 15 16 <div id="main-content" class="main-content"> 16 17 <section id="primary" class="content-area"> 17 18 <div id="content" class="site-content" role="main"> … … 46 47 </div><!-- #content --> 47 48 </section><!-- #primary --> 49 <?php get_sidebar( 'content' ); ?> 50 </div><!-- #main-content --> 48 51 49 52 <?php 50 get_sidebar( 'content' );51 53 get_sidebar(); 52 54 get_footer(); -
trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php
r25769 r25985 16 16 get_header(); ?> 17 17 18 <div id="main-content" class="main-content"> 18 19 <section id="primary" class="content-area"> 19 20 <div id="content" class="site-content" role="main"> … … 65 66 </div><!-- #content --> 66 67 </section><!-- #primary --> 68 </div><!-- #main-content --> 67 69 68 70 <?php 69 get_sidebar( 'content' );70 71 get_sidebar(); 71 72 get_footer();
Note: See TracChangeset
for help on using the changeset viewer.