From ed983a2c4e512ac9958a8fa78de47055836c418b Mon Sep 17 00:00:00 2001 From: lucha <lucha@paranoici.org> Date: Sun, 9 Dec 2018 12:18:48 -0800 Subject: [PATCH] [auto] theme: twentythirteen 2.5 --- wp-content/themes/twentythirteen/404.php | 2 +- wp-content/themes/twentythirteen/archive.php | 15 +- .../themes/twentythirteen/author-bio.php | 2 +- wp-content/themes/twentythirteen/author.php | 5 +- wp-content/themes/twentythirteen/category.php | 5 +- wp-content/themes/twentythirteen/comments.php | 33 +- .../themes/twentythirteen/content-aside.php | 19 +- .../themes/twentythirteen/content-audio.php | 19 +- .../themes/twentythirteen/content-chat.php | 19 +- .../themes/twentythirteen/content-gallery.php | 19 +- .../themes/twentythirteen/content-image.php | 19 +- .../themes/twentythirteen/content-link.php | 19 +- .../themes/twentythirteen/content-quote.php | 19 +- .../themes/twentythirteen/content-status.php | 19 +- .../themes/twentythirteen/content-video.php | 19 +- wp-content/themes/twentythirteen/content.php | 19 +- .../themes/twentythirteen/css/blocks.css | 526 +++++++++++++++++ .../twentythirteen/css/editor-blocks.css | 411 +++++++++++++ wp-content/themes/twentythirteen/footer.php | 2 +- .../themes/twentythirteen/functions.php | 542 ++++++++++-------- wp-content/themes/twentythirteen/header.php | 10 +- wp-content/themes/twentythirteen/image.php | 79 ++- .../themes/twentythirteen/inc/back-compat.php | 8 +- .../twentythirteen/inc/custom-header.php | 96 ++-- wp-content/themes/twentythirteen/index.php | 5 +- .../themes/twentythirteen/js/functions.js | 4 +- wp-content/themes/twentythirteen/page.php | 18 +- wp-content/themes/twentythirteen/readme.txt | 7 +- wp-content/themes/twentythirteen/search.php | 7 +- .../themes/twentythirteen/sidebar-main.php | 2 +- wp-content/themes/twentythirteen/sidebar.php | 2 +- wp-content/themes/twentythirteen/single.php | 7 +- wp-content/themes/twentythirteen/style.css | 2 +- wp-content/themes/twentythirteen/tag.php | 5 +- .../twentythirteen/taxonomy-post_format.php | 5 +- 35 files changed, 1404 insertions(+), 586 deletions(-) create mode 100644 wp-content/themes/twentythirteen/css/blocks.css create mode 100644 wp-content/themes/twentythirteen/css/editor-blocks.css diff --git a/wp-content/themes/twentythirteen/404.php b/wp-content/themes/twentythirteen/404.php index 528f82d37..eebc34b70 100644 --- a/wp-content/themes/twentythirteen/404.php +++ b/wp-content/themes/twentythirteen/404.php @@ -28,4 +28,4 @@ get_header(); ?> </div><!-- #content --> </div><!-- #primary --> -<?php get_footer(); ?> +<?php get_footer(); ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/archive.php b/wp-content/themes/twentythirteen/archive.php index f318aa1fe..445db7e64 100644 --- a/wp-content/themes/twentythirteen/archive.php +++ b/wp-content/themes/twentythirteen/archive.php @@ -24,10 +24,9 @@ get_header(); ?> <?php if ( have_posts() ) : ?> <header class="archive-header"> - <h1 class="archive-title"> - <?php - if ( is_day() ) : - printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() ); + <h1 class="archive-title"><?php + if ( is_day() ) : + printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() ); elseif ( is_month() ) : printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) ); elseif ( is_year() ) : @@ -35,15 +34,11 @@ get_header(); ?> else : _e( 'Archives', 'twentythirteen' ); endif; - ?> - </h1> + ?></h1> </header><!-- .archive-header --> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> diff --git a/wp-content/themes/twentythirteen/author-bio.php b/wp-content/themes/twentythirteen/author-bio.php index 690cfc0cb..ae2f522b3 100644 --- a/wp-content/themes/twentythirteen/author-bio.php +++ b/wp-content/themes/twentythirteen/author-bio.php @@ -31,4 +31,4 @@ </a> </p> </div><!-- .author-description --> -</div><!-- .author-info --> +</div><!-- .author-info --> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/author.php b/wp-content/themes/twentythirteen/author.php index efdd005db..c7b5d87ad 100644 --- a/wp-content/themes/twentythirteen/author.php +++ b/wp-content/themes/twentythirteen/author.php @@ -45,10 +45,7 @@ get_header(); ?> <?php endif; ?> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> diff --git a/wp-content/themes/twentythirteen/category.php b/wp-content/themes/twentythirteen/category.php index a219d544a..f82e0abcc 100644 --- a/wp-content/themes/twentythirteen/category.php +++ b/wp-content/themes/twentythirteen/category.php @@ -24,10 +24,7 @@ get_header(); ?> </header><!-- .archive-header --> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> diff --git a/wp-content/themes/twentythirteen/comments.php b/wp-content/themes/twentythirteen/comments.php index 9b92c68f8..3d1aff46b 100644 --- a/wp-content/themes/twentythirteen/comments.php +++ b/wp-content/themes/twentythirteen/comments.php @@ -13,9 +13,8 @@ * If the current post is protected by a password and the visitor has not yet * entered the password we will return early without loading the comments. */ -if ( post_password_required() ) { +if ( post_password_required() ) return; -} ?> <div id="comments" class="comments-area"> @@ -23,42 +22,38 @@ if ( post_password_required() ) { <?php if ( have_comments() ) : ?> <h2 class="comments-title"> <?php - printf( - _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'twentythirteen' ), - number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' - ); + printf( _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'twentythirteen' ), + number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' ); ?> </h2> <ol class="comment-list"> <?php - wp_list_comments( - array( - 'style' => 'ol', - 'short_ping' => true, - 'avatar_size' => 74, - ) - ); + wp_list_comments( array( + 'style' => 'ol', + 'short_ping' => true, + 'avatar_size' => 74, + ) ); ?> </ol><!-- .comment-list --> <?php // Are there comments to navigate through? - if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : + if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?> <nav class="navigation comment-navigation" role="navigation"> - <h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1> - <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentythirteen' ) ); ?></div> - <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentythirteen' ) ); ?></div> + <h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1> + <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentythirteen' ) ); ?></div> + <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentythirteen' ) ); ?></div> </nav><!-- .comment-navigation --> <?php endif; // Check for comment navigation ?> <?php if ( ! comments_open() && get_comments_number() ) : ?> - <p class="no-comments"><?php _e( 'Comments are closed.', 'twentythirteen' ); ?></p> + <p class="no-comments"><?php _e( 'Comments are closed.' , 'twentythirteen' ); ?></p> <?php endif; ?> <?php endif; // have_comments() ?> <?php comment_form(); ?> -</div><!-- #comments --> +</div><!-- #comments --> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/content-aside.php b/wp-content/themes/twentythirteen/content-aside.php index bbec8c9b9..fbc01e618 100644 --- a/wp-content/themes/twentythirteen/content-aside.php +++ b/wp-content/themes/twentythirteen/content-aside.php @@ -12,21 +12,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php index 728a68a8f..73a0d692b 100644 --- a/wp-content/themes/twentythirteen/content-audio.php +++ b/wp-content/themes/twentythirteen/content-audio.php @@ -23,21 +23,12 @@ <div class="audio-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .audio-content --> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-chat.php b/wp-content/themes/twentythirteen/content-chat.php index 92c703c8c..6a40b8932 100644 --- a/wp-content/themes/twentythirteen/content-chat.php +++ b/wp-content/themes/twentythirteen/content-chat.php @@ -22,21 +22,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-gallery.php b/wp-content/themes/twentythirteen/content-gallery.php index 705cb2da9..a43647f73 100644 --- a/wp-content/themes/twentythirteen/content-gallery.php +++ b/wp-content/themes/twentythirteen/content-gallery.php @@ -23,21 +23,12 @@ <?php if ( is_single() || ! get_post_gallery() ) : ?> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> <?php else : ?> <?php echo get_post_gallery(); ?> diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php index 866e63f89..01e2f3479 100644 --- a/wp-content/themes/twentythirteen/content-image.php +++ b/wp-content/themes/twentythirteen/content-image.php @@ -22,21 +22,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-link.php b/wp-content/themes/twentythirteen/content-link.php index 5fdbb8f9d..cc02d8240 100644 --- a/wp-content/themes/twentythirteen/content-link.php +++ b/wp-content/themes/twentythirteen/content-link.php @@ -23,21 +23,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-quote.php b/wp-content/themes/twentythirteen/content-quote.php index 83562bc5a..ac4de6729 100644 --- a/wp-content/themes/twentythirteen/content-quote.php +++ b/wp-content/themes/twentythirteen/content-quote.php @@ -12,21 +12,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-status.php b/wp-content/themes/twentythirteen/content-status.php index f37539660..e0e51f30e 100644 --- a/wp-content/themes/twentythirteen/content-status.php +++ b/wp-content/themes/twentythirteen/content-status.php @@ -12,21 +12,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php index aa8117632..8118a080f 100644 --- a/wp-content/themes/twentythirteen/content-video.php +++ b/wp-content/themes/twentythirteen/content-video.php @@ -22,21 +22,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> diff --git a/wp-content/themes/twentythirteen/content.php b/wp-content/themes/twentythirteen/content.php index aace9cdab..98b6c3195 100644 --- a/wp-content/themes/twentythirteen/content.php +++ b/wp-content/themes/twentythirteen/content.php @@ -40,21 +40,12 @@ <div class="entry-content"> <?php /* translators: %s: Name of current post */ - the_content( - sprintf( - __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), - the_title( '<span class="screen-reader-text">', '</span>', false ) - ) - ); + the_content( sprintf( + __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), + the_title( '<span class="screen-reader-text">', '</span>', false ) + ) ); - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); + wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> <?php endif; ?> diff --git a/wp-content/themes/twentythirteen/css/blocks.css b/wp-content/themes/twentythirteen/css/blocks.css new file mode 100644 index 000000000..e21e6935d --- /dev/null +++ b/wp-content/themes/twentythirteen/css/blocks.css @@ -0,0 +1,526 @@ +/* +Theme Name: Twenty Thirteen +Description: Used to style Gutenberg Blocks. +*/ + +/*-------------------------------------------------------------- +>>> TABLE OF CONTENTS: +---------------------------------------------------------------- +1.0 Block Alignments +2.0 General Block Styles +3.0 Blocks - Common Blocks +4.0 Blocks - Formatting +5.0 Blocks - Layout Elements +6.0 Blocks - Widgets +7.0 Blocks - Colors +--------------------------------------------------------------*/ + +/*-------------------------------------------------------------- +1.0 Block Alignments +--------------------------------------------------------------*/ + +.content-area { + overflow-x: hidden; /* prevents side-scrolling caused by use of vw */ +} + +[class^="wp-block-"].alignleft, +[class^="wp-block-"] .alignleft { + margin-right: 20px; +} + +[class^="wp-block-"].alignright, +[class^="wp-block-"] .alignright { + margin-left: 20px; +} + +.alignfull, +.alignwide { + clear: both; +} + +body:not(.sidebar) .alignwide { + margin-left: calc(25% - 25vw); + margin-right: calc(25% - 25vw); + width: auto; + max-width: 1600px; +} + +body:not(.sidebar) .alignfull { + margin-left: calc(50% - 50vw); + margin-right: calc(50% - 50vw); + width: auto; + max-width: 1600px; +} + +/* Make non image-based blocks a bit narrower, so they don't get cut off. */ +body:not(.sidebar) .wp-block-columns.alignfull, +body:not(.sidebar) .wp-block-audio.alignfull, +body:not(.sidebar) .wp-block-table.alignfull, +body:not(.sidebar) .wp-block-latest-comments.alignfull { + margin-left: calc(50% - 48vw); + margin-right: calc(50% - 48vw); +} + +@media (max-width: 999px) { + body.sidebar .alignwide { + margin-left: calc(25% - 25vw); + margin-right: calc(25% - 25vw); + width: auto; + max-width: 1600px; + } + + body.sidebar .alignfull { + margin-left: calc(50% - 50vw); + margin-right: calc(50% - 50vw); + width: auto; + max-width: 1600px; + } + + /* Make non image-based blocks a bit narrower, so they don't get cut off. */ + body.sidebar .wp-block-columns.alignfull, + body.sidebar .wp-block-audio.alignfull, + body.sidebar .wp-block-table.alignfull, + body.sidebar .wp-block-latest-comments.alignfull { + margin-left: calc(50% - 48vw); + margin-right: calc(50% - 48vw); + } +} + +@media (min-width: 1600px) { + + /* Make sure the full and wide blocks still stay in Twenty Thirteen's wide container */ + body:not(.sidebar) .alignfull { + margin-left: calc(50% - 800px); + margin-right: calc(50% - 800px); + width: auto; + max-width: 1000%; + } + + body:not(.sidebar) .wp-block-columns.alignfull, + body:not(.sidebar) .wp-block-audio.alignfull, + body:not(.sidebar) .wp-block-table.alignfull, + body:not(.sidebar) .wp-block-latest-comments.alignfull { + margin-left: calc(50% - 780px); + margin-right: calc(50% - 780px); + } + + body:not(.sidebar) .wp-block-gallery.alignfull { + margin-left: calc(50% - 808px); /* Adjust for gallery margins */ + margin-right: calc(50% - 808px); + width: auto; + max-width: 1000%; + } + + /* Make sure the 'wide' alignment doesn't get too wide. */ + body:not(.sidebar) .alignwide { + margin-left: -230px; + margin-right: -230px; + } +} + +/*-------------------------------------------------------------- +2.0 General Block Styles +--------------------------------------------------------------*/ + +/* Captions */ + +[class^="wp-block-"] figcaption, +[class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body { + color: #220e10; + font-size: 18px; + font-style: italic; + font-weight: 300; + line-height: 1.5; + margin: 0 0 24px; +} + +/*-------------------------------------------------------------- +3.0 Blocks - Common Blocks +--------------------------------------------------------------*/ + +/* Paragraph */ + +p.has-drop-cap:not(:focus)::first-letter { + font-size: 5em; +} + +/* Gallery */ + +.wp-block-gallery { + margin-bottom: 24px; +} + +.wp-block-gallery figcaption { + margin-bottom: 0; +} + +/* Quote */ + +.wp-block-quote { + margin: 24px 40px; + padding: 0; +} + +.wp-block-quote:not(.is-large):not(.is-style-large) { + border-left: 0; + border-right: 0; + padding-left: 0; + padding-right: 0; +} + +.wp-block-quote.is-large p, +.wp-block-quote.is-style-large p { + font-size: 28px; +} + +.wp-block-quote cite { + color: inherit; + font-size: inherit; + font-style: italic; +} + +/* Audio */ + +.wp-block-audio audio { + display: block; + width: 100%; +} + +/* Cover */ + +.wp-block-cover-image.aligncenter, +.wp-block-cover.aligncenter { + clear: both; + display: flex; +} + +/* File */ + +.wp-block-file .wp-block-file__button { + background: #e05d22; /* Old browsers */ + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ + border: none; + border-bottom: 3px solid #b93207; + border-radius: 2px; + color: #fff; + display: inline-block; + font-size: 16px; + padding: 11px 24px 10px; + text-decoration: none; +} + +.wp-block-file .wp-block-file__button:hover, +.wp-block-file .wp-block-file__button:focus { + background: #ed6a31; /* Old browsers */ + background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #ed6a31 0%, #e55627 100%); /* W3C */ + color: #fff; + outline: none; +} + +.wp-block-file .wp-block-file__button:active { + background: #d94412; /* Old browsers */ + background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #d94412 0%, #e05d22 100%); /* W3C */ + border: none; + border-top: 3px solid #b93207; + padding: 10px 24px 11px; +} + +/*-------------------------------------------------------------- +4.0 Blocks - Formatting +--------------------------------------------------------------*/ + +/* Code */ + +.wp-block-code { + background-color: transparent; + border: 0; + padding: 0; +} + +/* Pullquote */ + +.wp-block-pullquote { + border: 0; + color: inherit; + padding: 0.5em 0; +} + +.wp-block-pullquote__citation, +.wp-block-pullquote cite, +.wp-block-pullquote footer { + color: inherit; +} + +/* Table */ + +.wp-block-table { + border-bottom: 1px solid #ededed; + border-collapse: collapse; + border-spacing: 0; + font-size: 14px; + line-height: 2; + margin: 0 0 20px; + width: 100%; +} + +.wp-block-table th { + border: 0; + font-weight: bold; + text-transform: uppercase; +} + +.wp-block-table td { + border: 0; + border-top: 1px solid #ededed; +} + +body:not(.sidebar) .wp-block-table.alignwide, +body:not(.sidebar) .wp-block-table.alignfull { + width: 100%; +} + +/* Some acrobatics to make sure the table blocks always fill the available space. */ + +@media (max-width: 1599px) { + body:not(.sidebar) .wp-block-table.alignwide { + width: calc(302px + 50vw); /* Half the content area width plus half the screen width. */ + } + + body:not(.sidebar) .wp-block-table.alignfull { + width: 96vw; + } +} + +@media (max-width: 999px) { + body.sidebar .wp-block-table.alignwide { + width: calc(302px + 50vw); /* Half the content area width plus half the screen width. */ + } + + body.sidebar .wp-block-table.alignfull { + width: 96vw; + } +} + +@media (max-width: 654px) { + body:not(.sidebar) .wp-block-table.alignwide, + body.sidebar .wp-block-table.alignwide { + width: 96vw; + } +} + +@media (min-width: 1600px) { + body:not(.sidebar) .wp-block-table.alignwide { + width: 1064px; + } + + body:not(.sidebar) .wp-block-table.alignfull { + width: 1560px; + } +} + +/*-------------------------------------------------------------- +5.0 Blocks - Layout Elements +--------------------------------------------------------------*/ + +/* Buttons */ + +.wp-block-button.alignleft { + margin-right: 20px; +} + +.wp-block-button.alignright { + margin-left: 20px; +} + +.wp-block-button .wp-block-button__link { + background: #e05d22; /* Old browsers */ + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ + border: none; + border-bottom: 3px solid #b93207; + border-radius: 2px; + color: #fff; + display: inline-block; + font-size: 16px; + padding: 11px 24px 10px; + text-decoration: none; +} + +.wp-block-button .wp-block-button__link:hover, +.wp-block-button .wp-block-button__link:focus { + background: #ed6a31; /* Old browsers */ + background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #ed6a31 0%, #e55627 100%); /* W3C */ + color: #fff; + outline: none; +} + +.wp-block-button .wp-block-button__link:active { + background: #d94412; /* Old browsers */ + background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #d94412 0%, #e05d22 100%); /* W3C */ + border: none; + border-top: 3px solid #b93207; + padding: 10px 24px 11px; +} + +/* Separator */ + +.wp-block-separator { + border: 0; + max-width: 100px; +} + +.wp-block-separator.is-style-wide { + max-width: 100%; +} + +/* Media & Text */ + +.wp-block-media-text { + margin-bottom: 24px; +} + +.wp-block-media-text *:last-child { + margin-bottom: 0; +} + +/*-------------------------------------------------------------- +6.0 Blocks - Widgets +--------------------------------------------------------------*/ + +/* Archives, Categories & Latest Posts */ + +.wp-block-archives.aligncenter, +.wp-block-categories.aligncenter, +.wp-block-latest-posts.aligncenter { + list-style-position: inside; + text-align: center; +} + +/* Latest Comments */ + +.wp-block-latest-comments { + margin: 0; + padding: 0; +} + +.wp-block-latest-comments .avatar, +.wp-block-latest-comments__comment-avatar { + border-radius: 0; +} + +.wp-block-latest-comments__comment, +.wp-block-latest-comments__comment-excerpt, +.wp-block-latest-comments__comment-excerpt p { + font-size: 16px; +} + +.wp-block-latest-comments__comment-excerpt p:last-child { + margin-bottom: 0; +} + +.wp-block-latest-comments__comment-date { + font-size: 16px; +} + +.wp-block-latest-comments .wp-block-latest-comments__comment { + background: url(../images/dotted-line.png) repeat-x left top; + margin-bottom: 0; + padding: 24px 0; +} + +/*-------------------------------------------------------------- +7.0 Blocks - Colors +--------------------------------------------------------------*/ + +.has-dark-gray-color { + color: #141412; +} + +.has-dark-gray-background-color { + background-color: #141412; +} + +.has-red-color { + color: #bc360a; +} + +.has-red-background-color { + background-color: #bc360a; +} + +.has-medium-orange-color { + color: #db572f; +} + +.has-medium-orange-background-color { + background-color: #db572f; +} + +.has-light-orange-color { + color: #ea9629; +} + +.has-light-orange-background-color { + background-color: #ea9629; +} + +.has-yellow-color { + color: #fbca3c; +} + +.has-yellow-background-color { + background-color: #fbca3c; +} + +.has-white-color { + color: #fff; +} + +.has-white-background-color { + background-color: #fff; +} + +.has-dark-brown-color { + color: #220e10; +} + +.has-dark-brown-background-color { + background-color: #220e10; +} + +.has-medium-brown-color { + color: #722d19; +} + +.has-medium-brown-background-color { + background-color: #722d19; +} + +.has-light-brown-color { + color: #eadaa6; +} + +.has-light-brown-background-color { + background-color: #eadaa6; +} + +.has-beige-color { + color: #e8e5ce; +} + +.has-brown-background-color { + background-color: #e8e5ce; +} + +.has-off-white-color { + color: #f7f5e7; +} + +.has-off-white-background-color { + background-color: #f7f5e7; +} diff --git a/wp-content/themes/twentythirteen/css/editor-blocks.css b/wp-content/themes/twentythirteen/css/editor-blocks.css new file mode 100644 index 000000000..af2479e46 --- /dev/null +++ b/wp-content/themes/twentythirteen/css/editor-blocks.css @@ -0,0 +1,411 @@ +/* +Theme Name: Twenty Thirteen +Description: Used to style Gutenberg Blocks in the editor. +*/ + +/*-------------------------------------------------------------- +>>> TABLE OF CONTENTS: +---------------------------------------------------------------- +1.0 General Typography +2.0 General Block Styles +3.0 Blocks - Common Blocks +4.0 Blocks - Formatting +5.0 Blocks - Layout Elements +6.0 Blocks - Widgets +--------------------------------------------------------------*/ + +/*-------------------------------------------------------------- +1.0 Block Alignments +--------------------------------------------------------------*/ + +.editor-block-list__layout .editor-block-list__block[data-align="full"] > .editor-block-list__block-edit figure { + width: auto; +} + +/*-------------------------------------------------------------- +2.0 General Typography +--------------------------------------------------------------*/ + +.edit-post-visual-editor .editor-block-list__block, +.edit-post-visual-editor .editor-block-list__block p, +.editor-default-block-appender input[type="text"].editor-default-block-appender__content { + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-size: 16px; + font-weight: 400; + line-height: 1.5; +} + +.edit-post-visual-editor .editor-block-list__block { + color: #141412; +} + +.editor-post-title__block .editor-post-title__input { + font-family: Bitter, Georgia, serif; + font-size: 48px; + font-weight: 300; + line-height: 1.0909090909; + margin-bottom: 12px; + margin: 0 0 12px 0; +} + +/*-------------------------------------------------------------- +3.0 General Block Styles +--------------------------------------------------------------*/ + +/* Main content width */ + +.wp-block { + max-width: 634px; /* 604px + 30px to account for padding */ +} + +.wp-block.alignwide, +.wp-block.alignfull { + max-width: inherit; +} + +[class^="wp-block-"] .wp-block { + max-width: 100%; +} + +/* Link styles */ + +.edit-post-visual-editor a, +.editor-block-list__block a, +.wp-block-freeform.block-library-rich-text__tinymce a { + color: #bc360a; +} + +/* List styles */ + +.edit-post-visual-editor ul:not(.wp-block-gallery), +.editor-block-list__block ul:not(.wp-block-gallery), +.block-library-list ul, +.edit-post-visual-editor ol, +.editor-block-list__block ol, +.block-library-list ol { + margin: 16px 0; + padding: 0 0 0 40px; +} + +.block-library-list .editor-rich-text__tinymce { + padding: 0 0 0 40px; +} + +.edit-post-visual-editor ul:not(.wp-block-gallery), +.edit-post-visual-editor .editor-block-list__block ul:not(.wp-block-gallery), +.block-library-list ul { + list-style-type: square; +} + +.edit-post-visual-editor ol, +.editor-block-list__block ol, +.block-library-list ol { + list-style: decimal; +} + +.edit-post-visual-editor ul:not(.wp-block-gallery) li > ul, +.editor-block-list__block ul:not(.wp-block-gallery) li > ul, +.block-library-list li > ul, +.edit-post-visual-editor li > ol, +.editor-block-list__block li > ol, +.block-library-list li > ol { + margin: 0; +} + +.edit-post-visual-editor ul:not(.wp-block-gallery) li, +.editor-block-list__block ul:not(.wp-block-gallery) li, +.edit-post-visual-editor ol li, +.editor-block-list__block ol li, +.block-library-list li { + margin-bottom: 0; +} + +.rtl .edit-post-visual-editor ul:not(.wp-block-gallery), +.rtl .editor-block-list__block ul:not(.wp-block-gallery), +.rtl .block-library-list ul, +.rtl .edit-post-visual-editor ol, +.rtl .editor-block-list__block ol, +.rtl .block-library-list ol { + padding-left: 0; + padding-right: 40px; +} + +.rtl .block-library-list .editor-rich-text__tinymce { + padding-left: 0; + padding-right: 40px; +} + +/* Quote */ + +.wp-block-freeform.block-library-rich-text__tinymce blockquote { + border-left: 0; + border-right: 0; + font-style: italic; + margin: 24px 40px; + padding-left: 0; + padding-right: 0; +} + +.wp-block-freeform.block-library-rich-text__tinymce blockquote p { + font-size: 24px; + font-weight: 300; +} + +/* Table */ + +.rtl .editor-block-list__block table th, +.rtl .editor-block-list__block table td { + text-align: right; +} + +/* Code */ + +.wp-block-freeform.block-library-rich-text__tinymce code { + background: transparent; +} + +/* Captions */ + +[class^="wp-block-"] figcaption, +[class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body { + color: #220e10; + font-size: 18px; + font-style: italic; + font-weight: 300; + line-height: 1.5; + margin: 0 0 24px; +} + +/*-------------------------------------------------------------- +4.0 Blocks - Common Blocks +--------------------------------------------------------------*/ + +/* Paragraph */ + +p.has-drop-cap:not(:focus)::first-letter { + font-size: 5em; +} + +/* Gallery */ + +.edit-post-visual-editor .wp-block-gallery { + margin-bottom: 24px; + padding: 0; +} + +.wp-block-gallery figcaption, +.wp-block-gallery figcaption.editor-rich-text__tinymce.mce-content-body { + color: #fff; + font-size: 13px; + margin-bottom: 0; +} + +/* Quote */ + +.wp-block-quote { + font-style: italic; + margin: 24px 40px; + padding: 0; +} + +.editor-block-list__block .wp-block-quote p { + font-size: 24px; + font-weight: 300; +} + +.wp-block-quote:not(.is-large):not(.is-style-large) { + border-left: 0; + border-right: 0; + padding-left: 0; + padding-right: 0; +} + +.wp-block-quote .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body { + color: inherit; + font-size: 16px; + font-style: italic; + text-transform: uppercase; +} + +.wp-block-quote.is-large p, +.wp-block-quote.is-style-large p { + font-size: 28px; +} + +.wp-block-quote.is-large .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body, +.wp-block-quote.is-style-large .wp-block-quote__citation.editor-rich-text__tinymce.mce-content-body { + font-size: 18px; +} + +/* Cover */ + +.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p.wp-block-cover-image-text, +.edit-post-visual-editor .editor-block-list__block .wp-block-cover p.wp-block-cover-text { + font-size: 32px; + line-height: 1.25; +} + +/* File */ + +.wp-block-file .wp-block-file__textlink { + color: #bc360a; +} + +.wp-block-file .wp-block-file__button { + background: #e05d22; /* Old browsers */ + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ + border: none; + border-bottom: 3px solid #b93207; + border-radius: 2px; + color: #fff; + display: inline-block; + font-size: 16px; + line-height: 24px; + padding: 11px 24px 10px; + text-decoration: none; +} + +/*-------------------------------------------------------------- +5.0 Blocks - Formatting +--------------------------------------------------------------*/ + +/* Code */ + +.wp-block-code { + border: 0; + padding: 0; +} + +/* Pullquote */ + +.edit-post-visual-editor .wp-block-pullquote { + border: 0; + padding: 0.5em 0; +} + +.edit-post-visual-editor .editor-block-list__block .wp-block-pullquote p { + font-weight: 300; +} + +.edit-post-visual-editor .wp-block-pullquote__citation, +.edit-post-visual-editor .wp-block-pullquote cite, +.edit-post-visual-editor .wp-block-pullquote footer { + color: #141412; + font-size: 16px; +} + +/* Table */ + +.wp-block-table { + border-bottom: 1px solid #ededed; + border-collapse: collapse; + border-spacing: 0; + font-size: 14px; + line-height: 2; + margin: 0 0 20px; + width: 100%; +} + +.wp-block-table th { + border: 0; + font-weight: bold; + text-transform: uppercase; +} + +.editor-block-list__block .wp-block-table td { + border: 0; + border-top: 1px solid #ededed; + padding: 0; +} + +/*-------------------------------------------------------------- +6.0 Blocks - Layout Elements +--------------------------------------------------------------*/ + +/* Buttons */ + +.wp-block-button .wp-block-button__link { + background: #e05d22; /* Old browsers */ + background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome 10+, Safari 5.1+ */ + background: linear-gradient(to bottom, #e05d22 0%, #d94412 100%); /* W3C */ + border: none; + border-bottom: 3px solid #b93207; + border-radius: 2px; + color: #fff; + display: inline-block; + font-size: 16px; + line-height: 24px; + padding: 11px 24px 10px; + text-decoration: none; +} + +/* Separator */ + +.editor-block-list__block hr.wp-block-separator { + margin-left: auto; + margin-right: auto; +} + +/* Media & Text */ + +.wp-block-media-text *:last-child { + margin-bottom: 0; +} + +/*-------------------------------------------------------------- +7.0 Blocks - Widgets +--------------------------------------------------------------*/ + +/* Archives, Categories & Latest Posts */ + +[data-align="center"] .wp-block-archives ul, +[data-align="center"] .wp-block-categories ul, +[data-align="center"] .wp-block-latest-posts ul { + list-style-position: inside; + text-align: center; +} + +/* Latest Comments */ + +.editor-block-list__block .wp-block-latest-comments { + margin: 0; + padding: 0; +} + +.wp-block-latest-comments .avatar, +.wp-block-latest-comments__comment-avatar { + border-radius: 0; +} + +.wp-block-latest-comments__comment, +.wp-block-latest-comments__comment-excerpt, +.wp-block-latest-comments__comment-excerpt p { + font-size: 16px; +} + +.wp-block-latest-comments__comment-excerpt p:last-child { + margin-bottom: 0; +} + +.wp-block-latest-comments__comment-date { + font-size: 16px; +} + +.wp-block-latest-comments .wp-block-latest-comments__comment { + background: url(../images/dotted-line.png) repeat-x left top; + margin-bottom: 0; + padding: 24px 0; +} + +/* Latest Posts */ + +.edit-post-visual-editor .editor-block-list__block .wp-block-latest-posts.is-grid { + list-style-type: none; + margin-left: 0; + margin-right: 0; +} + +.edit-post-visual-editor .wp-block-latest-posts.is-grid li { + margin-bottom: 1em; +} diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php index 858f110b5..af6d04c57 100644 --- a/wp-content/themes/twentythirteen/footer.php +++ b/wp-content/themes/twentythirteen/footer.php @@ -30,4 +30,4 @@ <?php wp_footer(); ?> </body> -</html> +</html> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php index 68a387131..e52bbb67b 100644 --- a/wp-content/themes/twentythirteen/functions.php +++ b/wp-content/themes/twentythirteen/functions.php @@ -28,9 +28,8 @@ * * @see twentythirteen_content_width() for template-specific adjustments. */ -if ( ! isset( $content_width ) ) { +if ( ! isset( $content_width ) ) $content_width = 604; -} /** * Add support for a custom header image. @@ -40,9 +39,8 @@ require get_template_directory() . '/inc/custom-header.php'; /** * Twenty Thirteen only works in WordPress 3.6 or later. */ -if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) { +if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) require get_template_directory() . '/inc/back-compat.php'; -} /** * Twenty Thirteen setup. @@ -76,6 +74,77 @@ function twentythirteen_setup() { */ add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentythirteen_fonts_url() ) ); + // Load regular editor styles into the new block-based editor. + add_theme_support( 'editor-styles' ); + + // Load default block styles. + add_theme_support( 'wp-block-styles' ); + + // Add support for full and wide align images. + add_theme_support( 'align-wide' ); + + // Add support for responsive embeds. + add_theme_support( 'responsive-embeds' ); + + // Add support for custom color scheme. + add_theme_support( 'editor-color-palette', array( + array( + 'name' => __( 'Dark Gray', 'twentythirteen' ), + 'slug' => 'dark-gray', + 'color' => '#141412', + ), + array( + 'name' => __( 'Red', 'twentythirteen' ), + 'slug' => 'red', + 'color' => '#bc360a', + ), + array( + 'name' => __( 'Medium Orange', 'twentythirteen' ), + 'slug' => 'medium-orange', + 'color' => '#db572f', + ), + array( + 'name' => __( 'Light Orange', 'twentythirteen' ), + 'slug' => 'light-orange', + 'color' => '#ea9629', + ), + array( + 'name' => __( 'Yellow', 'twentythirteen' ), + 'slug' => 'yellow', + 'color' => '#fbca3c', + ), + array( + 'name' => __( 'White', 'twentythirteen' ), + 'slug' => 'white', + 'color' => '#fff', + ), + array( + 'name' => __( 'Dark Brown', 'twentythirteen' ), + 'slug' => 'dark-brown', + 'color' => '#220e10', + ), + array( + 'name' => __( 'Medium Brown', 'twentythirteen' ), + 'slug' => 'medium-brown', + 'color' => '#722d19', + ), + array( + 'name' => __( 'Light Brown', 'twentythirteen' ), + 'slug' => 'light-brown', + 'color' => '#eadaa6', + ), + array( + 'name' => __( 'Beige', 'twentythirteen' ), + 'slug' => 'beige', + 'color' => '#e8e5ce', + ), + array( + 'name' => __( 'Off-white', 'twentythirteen' ), + 'slug' => 'off-white', + 'color' => '#f7f5e7', + ), + ) ); + // Adds RSS feed links to <head> for posts and comments. add_theme_support( 'automatic-feed-links' ); @@ -83,33 +152,17 @@ function twentythirteen_setup() { * Switches default core markup for search form, comment form, * and comments to output valid HTML5. */ - add_theme_support( - 'html5', array( - 'search-form', - 'comment-form', - 'comment-list', - 'gallery', - 'caption', - ) - ); + add_theme_support( 'html5', array( + 'search-form', 'comment-form', 'comment-list', 'gallery', 'caption' + ) ); /* * This theme supports all available post formats by default. * See https://codex.wordpress.org/Post_Formats */ - add_theme_support( - 'post-formats', array( - 'aside', - 'audio', - 'chat', - 'gallery', - 'image', - 'link', - 'quote', - 'status', - 'video', - ) - ); + add_theme_support( 'post-formats', array( + 'aside', 'audio', 'chat', 'gallery', 'image', 'link', 'quote', 'status', 'video' + ) ); // This theme uses wp_nav_menu() in one location. register_nav_menu( 'primary', __( 'Navigation Menu', 'twentythirteen' ) ); @@ -157,19 +210,17 @@ function twentythirteen_fonts_url() { if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) { $font_families = array(); - if ( 'off' !== $source_sans_pro ) { + if ( 'off' !== $source_sans_pro ) $font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic'; - } - if ( 'off' !== $bitter ) { + if ( 'off' !== $bitter ) $font_families[] = 'Bitter:400,700'; - } $query_args = array( 'family' => urlencode( implode( '|', $font_families ) ), 'subset' => urlencode( 'latin,latin-ext' ), ); - $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); + $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); } return $fonts_url; @@ -185,14 +236,12 @@ function twentythirteen_scripts_styles() { * Adds JavaScript to pages with the comment form to support * sites with threaded comments (when in use). */ - if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { + if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); - } // Adds Masonry to handle vertical alignment of footer widgets. - if ( is_active_sidebar( 'sidebar-1' ) ) { + if ( is_active_sidebar( 'sidebar-1' ) ) wp_enqueue_script( 'jquery-masonry' ); - } // Loads JavaScript file with functionality specific to Twenty Thirteen. wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160717', true ); @@ -206,6 +255,9 @@ function twentythirteen_scripts_styles() { // Loads our main stylesheet. wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), '2013-07-18' ); + // Theme block stylesheet. + wp_enqueue_style( 'twentythirteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentythirteen-style' ), '2018-10-18' ); + // Loads the Internet Explorer specific stylesheet. wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '2013-07-18' ); wp_style_add_data( 'twentythirteen-ie', 'conditional', 'lt IE 9' ); @@ -237,6 +289,19 @@ function twentythirteen_resource_hints( $urls, $relation_type ) { } add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 ); +/** + * Enqueue editor styles for Gutenberg + * + * @since Twenty Thirteen 2.5 + */ +function twentythirteen_block_editor_styles() { + // Block styles. + wp_enqueue_style( 'twentythirteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css' ); + // Add custom fonts. + wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null ); +} +add_action( 'enqueue_block_editor_assets', 'twentythirteen_block_editor_styles' ); + /** * Filter the page title. * @@ -252,23 +317,20 @@ add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 ); function twentythirteen_wp_title( $title, $sep ) { global $paged, $page; - if ( is_feed() ) { + if ( is_feed() ) return $title; - } // Add the site name. $title .= get_bloginfo( 'name', 'display' ); // Add the site description for the home/front page. $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) { + if ( $site_description && ( is_home() || is_front_page() ) ) $title = "$title $sep $site_description"; - } // Add a page number if necessary. - if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) { + if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) $title = "$title $sep " . sprintf( __( 'Page %s', 'twentythirteen' ), max( $paged, $page ) ); - } return $title; } @@ -280,47 +342,42 @@ add_filter( 'wp_title', 'twentythirteen_wp_title', 10, 2 ); * @since Twenty Thirteen 1.0 */ function twentythirteen_widgets_init() { - register_sidebar( - array( - 'name' => __( 'Main Widget Area', 'twentythirteen' ), - 'id' => 'sidebar-1', - 'description' => __( 'Appears in the footer section of the site.', 'twentythirteen' ), - 'before_widget' => '<aside id="%1$s" class="widget %2$s">', - 'after_widget' => '</aside>', - 'before_title' => '<h3 class="widget-title">', - 'after_title' => '</h3>', - ) - ); - - register_sidebar( - array( - 'name' => __( 'Secondary Widget Area', 'twentythirteen' ), - 'id' => 'sidebar-2', - 'description' => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ), - 'before_widget' => '<aside id="%1$s" class="widget %2$s">', - 'after_widget' => '</aside>', - 'before_title' => '<h3 class="widget-title">', - 'after_title' => '</h3>', - ) - ); + register_sidebar( array( + 'name' => __( 'Main Widget Area', 'twentythirteen' ), + 'id' => 'sidebar-1', + 'description' => __( 'Appears in the footer section of the site.', 'twentythirteen' ), + 'before_widget' => '<aside id="%1$s" class="widget %2$s">', + 'after_widget' => '</aside>', + 'before_title' => '<h3 class="widget-title">', + 'after_title' => '</h3>', + ) ); + + register_sidebar( array( + 'name' => __( 'Secondary Widget Area', 'twentythirteen' ), + 'id' => 'sidebar-2', + 'description' => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ), + 'before_widget' => '<aside id="%1$s" class="widget %2$s">', + 'after_widget' => '</aside>', + 'before_title' => '<h3 class="widget-title">', + 'after_title' => '</h3>', + ) ); } add_action( 'widgets_init', 'twentythirteen_widgets_init' ); if ( ! function_exists( 'twentythirteen_paging_nav' ) ) : - /** - * Display navigation to next/previous set of posts when applicable. - * - * @since Twenty Thirteen 1.0 - */ - function twentythirteen_paging_nav() { - global $wp_query; - - // Don't print empty markup if there's only one page. - if ( $wp_query->max_num_pages < 2 ) { - return; - } - ?> - <nav class="navigation paging-navigation" role="navigation"> +/** + * Display navigation to next/previous set of posts when applicable. + * + * @since Twenty Thirteen 1.0 + */ +function twentythirteen_paging_nav() { + global $wp_query; + + // Don't print empty markup if there's only one page. + if ( $wp_query->max_num_pages < 2 ) + return; + ?> + <nav class="navigation paging-navigation" role="navigation"> <h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1> <div class="nav-links"> @@ -335,27 +392,26 @@ if ( ! function_exists( 'twentythirteen_paging_nav' ) ) : </div><!-- .nav-links --> </nav><!-- .navigation --> <?php - } +} endif; if ( ! function_exists( 'twentythirteen_post_nav' ) ) : - /** - * Display navigation to next/previous post when applicable. - * - * @since Twenty Thirteen 1.0 - */ - function twentythirteen_post_nav() { - global $post; +/** + * Display navigation to next/previous post when applicable. + * + * @since Twenty Thirteen 1.0 + */ +function twentythirteen_post_nav() { + global $post; - // Don't print empty markup if there's nowhere to navigate. - $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true ); - $next = get_adjacent_post( false, '', false ); + // Don't print empty markup if there's nowhere to navigate. + $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true ); + $next = get_adjacent_post( false, '', false ); - if ( ! $next && ! $previous ) { - return; - } - ?> - <nav class="navigation post-navigation" role="navigation"> + if ( ! $next && ! $previous ) + return; + ?> + <nav class="navigation post-navigation" role="navigation"> <h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1> <div class="nav-links"> @@ -365,149 +421,140 @@ if ( ! function_exists( 'twentythirteen_post_nav' ) ) : </div><!-- .nav-links --> </nav><!-- .navigation --> <?php - } +} endif; if ( ! function_exists( 'twentythirteen_entry_meta' ) ) : - /** - * Print HTML with meta information for current post: categories, tags, permalink, author, and date. - * - * Create your own twentythirteen_entry_meta() to override in a child theme. - * - * @since Twenty Thirteen 1.0 - */ - function twentythirteen_entry_meta() { - if ( is_sticky() && is_home() && ! is_paged() ) { - echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>'; - } +/** + * Print HTML with meta information for current post: categories, tags, permalink, author, and date. + * + * Create your own twentythirteen_entry_meta() to override in a child theme. + * + * @since Twenty Thirteen 1.0 + */ +function twentythirteen_entry_meta() { + if ( is_sticky() && is_home() && ! is_paged() ) + echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>'; - if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) { - twentythirteen_entry_date(); - } + if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) + twentythirteen_entry_date(); - // Translators: used between list items, there is a space after the comma. - $categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) ); - if ( $categories_list ) { - echo '<span class="categories-links">' . $categories_list . '</span>'; - } + // Translators: used between list items, there is a space after the comma. + $categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) ); + if ( $categories_list ) { + echo '<span class="categories-links">' . $categories_list . '</span>'; + } - // Translators: used between list items, there is a space after the comma. - $tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) ); - if ( $tag_list ) { - echo '<span class="tags-links">' . $tag_list . '</span>'; - } + // Translators: used between list items, there is a space after the comma. + $tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) ); + if ( $tag_list ) { + echo '<span class="tags-links">' . $tag_list . '</span>'; + } - // Post author - if ( 'post' == get_post_type() ) { - printf( - '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>', - esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), - esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ), - get_the_author() - ); - } + // Post author + if ( 'post' == get_post_type() ) { + printf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>', + esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), + esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ), + get_the_author() + ); } +} endif; if ( ! function_exists( 'twentythirteen_entry_date' ) ) : - /** - * Print HTML with date information for current post. - * - * Create your own twentythirteen_entry_date() to override in a child theme. - * - * @since Twenty Thirteen 1.0 - * - * @param boolean $echo (optional) Whether to echo the date. Default true. - * @return string The HTML-formatted post date. - */ - function twentythirteen_entry_date( $echo = true ) { - if ( has_post_format( array( 'chat', 'status' ) ) ) { - $format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' ); - } else { - $format_prefix = '%2$s'; - } - - $date = sprintf( - '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>', - esc_url( get_permalink() ), - esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ), - esc_attr( get_the_date( 'c' ) ), - esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) ) - ); +/** + * Print HTML with date information for current post. + * + * Create your own twentythirteen_entry_date() to override in a child theme. + * + * @since Twenty Thirteen 1.0 + * + * @param boolean $echo (optional) Whether to echo the date. Default true. + * @return string The HTML-formatted post date. + */ +function twentythirteen_entry_date( $echo = true ) { + if ( has_post_format( array( 'chat', 'status' ) ) ) + $format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' ); + else + $format_prefix = '%2$s'; + + $date = sprintf( '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>', + esc_url( get_permalink() ), + esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ), + esc_attr( get_the_date( 'c' ) ), + esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) ) + ); - if ( $echo ) { - echo $date; - } + if ( $echo ) + echo $date; - return $date; - } + return $date; +} endif; if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) : +/** + * Print the attached image with a link to the next attached image. + * + * @since Twenty Thirteen 1.0 + */ +function twentythirteen_the_attached_image() { /** - * Print the attached image with a link to the next attached image. + * Filter the image attachment size to use. + * + * @since Twenty thirteen 1.0 * - * @since Twenty Thirteen 1.0 + * @param array $size { + * @type int The attachment height in pixels. + * @type int The attachment width in pixels. + * } */ - function twentythirteen_the_attached_image() { - /** - * Filter the image attachment size to use. - * - * @since Twenty thirteen 1.0 - * - * @param array $size { - * @type int The attachment height in pixels. - * @type int The attachment width in pixels. - * } - */ - $attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) ); - $next_attachment_url = wp_get_attachment_url(); - $post = get_post(); - - /* - * Grab the IDs of all the image attachments in a gallery so we can get the URL - * of the next adjacent image in a gallery, or the first image (if we're - * looking at the last image in a gallery), or, in a gallery of one, just the - * link to that image file. - */ - $attachment_ids = get_posts( - array( - 'post_parent' => $post->post_parent, - 'fields' => 'ids', - 'numberposts' => -1, - 'post_status' => 'inherit', - 'post_type' => 'attachment', - 'post_mime_type' => 'image', - 'order' => 'ASC', - 'orderby' => 'menu_order ID', - ) - ); - - // If there is more than 1 attachment in a gallery... - if ( count( $attachment_ids ) > 1 ) { - foreach ( $attachment_ids as $idx => $attachment_id ) { - if ( $attachment_id == $post->ID ) { - $next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ]; - break; - } - } + $attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) ); + $next_attachment_url = wp_get_attachment_url(); + $post = get_post(); - // get the URL of the next image attachment... - if ( $next_id ) { - $next_attachment_url = get_attachment_link( $next_id ); - } // or get the URL of the first image attachment. - else { - $next_attachment_url = get_attachment_link( reset( $attachment_ids ) ); + /* + * Grab the IDs of all the image attachments in a gallery so we can get the URL + * of the next adjacent image in a gallery, or the first image (if we're + * looking at the last image in a gallery), or, in a gallery of one, just the + * link to that image file. + */ + $attachment_ids = get_posts( array( + 'post_parent' => $post->post_parent, + 'fields' => 'ids', + 'numberposts' => -1, + 'post_status' => 'inherit', + 'post_type' => 'attachment', + 'post_mime_type' => 'image', + 'order' => 'ASC', + 'orderby' => 'menu_order ID', + ) ); + + // If there is more than 1 attachment in a gallery... + if ( count( $attachment_ids ) > 1 ) { + foreach ( $attachment_ids as $idx => $attachment_id ) { + if ( $attachment_id == $post->ID ) { + $next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ]; + break; } } - printf( - '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>', - esc_url( $next_attachment_url ), - the_title_attribute( array( 'echo' => false ) ), - wp_get_attachment_image( $post->ID, $attachment_size ) - ); + // get the URL of the next image attachment... + if ( $next_id ) + $next_attachment_url = get_attachment_link( $next_id ); + + // or get the URL of the first image attachment. + else + $next_attachment_url = get_attachment_link( reset( $attachment_ids ) ); } + + printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>', + esc_url( $next_attachment_url ), + the_title_attribute( array( 'echo' => false ) ), + wp_get_attachment_image( $post->ID, $attachment_size ) + ); +} endif; /** @@ -530,25 +577,24 @@ function twentythirteen_get_link_url() { } if ( ! function_exists( 'twentythirteen_excerpt_more' ) && ! is_admin() ) : - /** - * Replaces "[...]" (appended to automatically generated excerpts) with ... - * and a Continue reading link. - * - * @since Twenty Thirteen 1.4 - * - * @param string $more Default Read More excerpt link. - * @return string Filtered Read More excerpt link. - */ - function twentythirteen_excerpt_more( $more ) { - $link = sprintf( - '<a href="%1$s" class="more-link">%2$s</a>', - esc_url( get_permalink( get_the_ID() ) ), +/** + * Replaces "[...]" (appended to automatically generated excerpts) with ... + * and a Continue reading link. + * + * @since Twenty Thirteen 1.4 + * + * @param string $more Default Read More excerpt link. + * @return string Filtered Read More excerpt link. + */ +function twentythirteen_excerpt_more( $more ) { + $link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>', + esc_url( get_permalink( get_the_ID() ) ), /* translators: %s: Name of current post */ sprintf( __( 'Continue reading %s <span class="meta-nav">→</span>', 'twentythirteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' ) ); - return ' … ' . $link; - } - add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' ); + return ' … ' . $link; +} +add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' ); endif; /** @@ -565,17 +611,14 @@ endif; * @return array The filtered body class list. */ function twentythirteen_body_class( $classes ) { - if ( ! is_multi_author() ) { + if ( ! is_multi_author() ) $classes[] = 'single-author'; - } - if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() ) { + if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() ) $classes[] = 'sidebar'; - } - if ( ! get_option( 'show_avatars' ) ) { + if ( ! get_option( 'show_avatars' ) ) $classes[] = 'no-avatars'; - } return $classes; } @@ -589,11 +632,10 @@ add_filter( 'body_class', 'twentythirteen_body_class' ); function twentythirteen_content_width() { global $content_width; - if ( is_attachment() ) { + if ( is_attachment() ) $content_width = 724; - } elseif ( has_post_format( 'audio' ) ) { + elseif ( has_post_format( 'audio' ) ) $content_width = 484; - } } add_action( 'template_redirect', 'twentythirteen_content_width' ); @@ -610,20 +652,16 @@ function twentythirteen_customize_register( $wp_customize ) { $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage'; if ( isset( $wp_customize->selective_refresh ) ) { - $wp_customize->selective_refresh->add_partial( - 'blogname', array( - 'selector' => '.site-title', - 'container_inclusive' => false, - 'render_callback' => 'twentythirteen_customize_partial_blogname', - ) - ); - $wp_customize->selective_refresh->add_partial( - 'blogdescription', array( - 'selector' => '.site-description', - 'container_inclusive' => false, - 'render_callback' => 'twentythirteen_customize_partial_blogdescription', - ) - ); + $wp_customize->selective_refresh->add_partial( 'blogname', array( + 'selector' => '.site-title', + 'container_inclusive' => false, + 'render_callback' => 'twentythirteen_customize_partial_blogname', + ) ); + $wp_customize->selective_refresh->add_partial( 'blogdescription', array( + 'selector' => '.site-description', + 'container_inclusive' => false, + 'render_callback' => 'twentythirteen_customize_partial_blogdescription', + ) ); } } add_action( 'customize_register', 'twentythirteen_customize_register' ); diff --git a/wp-content/themes/twentythirteen/header.php b/wp-content/themes/twentythirteen/header.php index 625347282..094f74cc9 100644 --- a/wp-content/themes/twentythirteen/header.php +++ b/wp-content/themes/twentythirteen/header.php @@ -42,15 +42,7 @@ <nav id="site-navigation" class="navigation main-navigation" role="navigation"> <button class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></button> <a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a> - <?php - wp_nav_menu( - array( - 'theme_location' => 'primary', - 'menu_class' => 'nav-menu', - 'menu_id' => 'primary-menu', - ) - ); -?> + <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?> <?php get_search_form(); ?> </nav><!-- #site-navigation --> </div><!-- #navbar --> diff --git a/wp-content/themes/twentythirteen/image.php b/wp-content/themes/twentythirteen/image.php index f6de824ca..c29caedf6 100644 --- a/wp-content/themes/twentythirteen/image.php +++ b/wp-content/themes/twentythirteen/image.php @@ -16,57 +16,53 @@ get_header(); ?> <?php // Start the Loop. - while ( have_posts() ) : - the_post(); + while ( have_posts() ) : the_post(); ?> <article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>> - <header class="entry-header"> - <h1 class="entry-title"><?php the_title(); ?></h1> - - <div class="entry-meta"> - <?php - $published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' ); - $post_title = get_the_title( $post->post_parent ); - if ( empty( $post_title ) || 0 == $post->post_parent ) { - $published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>'; - } - - printf( - $published_text, - esc_attr( get_the_date( 'c' ) ), - esc_html( get_the_date() ), - esc_url( get_permalink( $post->post_parent ) ), - esc_attr( strip_tags( $post_title ) ), - $post_title - ); - - $metadata = wp_get_attachment_metadata(); - printf( - '<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s × %5$s)</a></span>', - esc_url( wp_get_attachment_url() ), - esc_attr__( 'Link to full-size image', 'twentythirteen' ), - __( 'Full resolution', 'twentythirteen' ), - $metadata['width'], - $metadata['height'] - ); - - edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); - ?> + <header class="entry-header"> + <h1 class="entry-title"><?php the_title(); ?></h1> + + <div class="entry-meta"> + <?php + $published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' ); + $post_title = get_the_title( $post->post_parent ); + if ( empty( $post_title ) || 0 == $post->post_parent ) + $published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>'; + + printf( $published_text, + esc_attr( get_the_date( 'c' ) ), + esc_html( get_the_date() ), + esc_url( get_permalink( $post->post_parent ) ), + esc_attr( strip_tags( $post_title ) ), + $post_title + ); + + $metadata = wp_get_attachment_metadata(); + printf( '<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s × %5$s)</a></span>', + esc_url( wp_get_attachment_url() ), + esc_attr__( 'Link to full-size image', 'twentythirteen' ), + __( 'Full resolution', 'twentythirteen' ), + $metadata['width'], + $metadata['height'] + ); + + edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); + ?> </div><!-- .entry-meta --> </header><!-- .entry-header --> <div class="entry-content"> <nav id="image-navigation" class="navigation image-navigation" role="navigation"> - <span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">←</span> Previous', 'twentythirteen' ) ); ?></span> + <span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">←</span> Previous', 'twentythirteen' ) ); ?></span> <span class="nav-next"><?php next_image_link( false, __( 'Next <span class="meta-nav">→</span>', 'twentythirteen' ) ); ?></span> </nav><!-- #image-navigation --> <div class="entry-attachment"> <div class="attachment"> - <?php twentythirteen_the_attached_image(); ?> + <?php twentythirteen_the_attached_image(); ?> - <?php if ( has_excerpt() ) : ?> + <?php if ( has_excerpt() ) : ?> <div class="entry-caption"> <?php the_excerpt(); ?> </div> @@ -77,14 +73,7 @@ get_header(); ?> <?php if ( ! empty( $post->post_content ) ) : ?> <div class="entry-description"> <?php the_content(); ?> - <?php - wp_link_pages( - array( - 'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ), - 'after' => '</div>', - ) - ); - ?> + <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ), 'after' => '</div>' ) ); ?> </div><!-- .entry-description --> <?php endif; ?> diff --git a/wp-content/themes/twentythirteen/inc/back-compat.php b/wp-content/themes/twentythirteen/inc/back-compat.php index 9f72aa189..993ef1c6a 100644 --- a/wp-content/themes/twentythirteen/inc/back-compat.php +++ b/wp-content/themes/twentythirteen/inc/back-compat.php @@ -44,11 +44,9 @@ function twentythirteen_upgrade_notice() { * @since Twenty Thirteen 1.0 */ function twentythirteen_customize() { - wp_die( - sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array( - 'back_link' => true, - ) - ); + wp_die( sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array( + 'back_link' => true, + ) ); } add_action( 'load-customize.php', 'twentythirteen_customize' ); diff --git a/wp-content/themes/twentythirteen/inc/custom-header.php b/wp-content/themes/twentythirteen/inc/custom-header.php index c572c3bb5..9e40bfe06 100644 --- a/wp-content/themes/twentythirteen/inc/custom-header.php +++ b/wp-content/themes/twentythirteen/inc/custom-header.php @@ -42,25 +42,23 @@ function twentythirteen_custom_header_setup() { * Default custom headers packaged with the theme. * %s is a placeholder for the theme template directory URI. */ - register_default_headers( - array( - 'circle' => array( - 'url' => '%s/images/headers/circle.png', - 'thumbnail_url' => '%s/images/headers/circle-thumbnail.png', - 'description' => _x( 'Circle', 'header image description', 'twentythirteen' ), - ), - 'diamond' => array( - 'url' => '%s/images/headers/diamond.png', - 'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png', - 'description' => _x( 'Diamond', 'header image description', 'twentythirteen' ), - ), - 'star' => array( - 'url' => '%s/images/headers/star.png', - 'thumbnail_url' => '%s/images/headers/star-thumbnail.png', - 'description' => _x( 'Star', 'header image description', 'twentythirteen' ), - ), - ) - ); + register_default_headers( array( + 'circle' => array( + 'url' => '%s/images/headers/circle.png', + 'thumbnail_url' => '%s/images/headers/circle-thumbnail.png', + 'description' => _x( 'Circle', 'header image description', 'twentythirteen' ) + ), + 'diamond' => array( + 'url' => '%s/images/headers/diamond.png', + 'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png', + 'description' => _x( 'Diamond', 'header image description', 'twentythirteen' ) + ), + 'star' => array( + 'url' => '%s/images/headers/star.png', + 'thumbnail_url' => '%s/images/headers/star-thumbnail.png', + 'description' => _x( 'Star', 'header image description', 'twentythirteen' ) + ), + ) ); } add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup', 11 ); @@ -90,50 +88,49 @@ function twentythirteen_header_style() { $text_color = get_header_textcolor(); // If no custom options for text are set, let's bail. - if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) { + if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) return; - } // If we get this far, we have custom styles. ?> <style type="text/css" id="twentythirteen-header-css"> <?php - if ( ! empty( $header_image ) ) : + if ( ! empty( $header_image ) ) : ?> - .site-header { - background: url(<?php header_image(); ?>) no-repeat scroll top; - background-size: 1600px auto; - } - @media (max-width: 767px) { .site-header { - background-size: 768px auto; + background: url(<?php header_image(); ?>) no-repeat scroll top; + background-size: 1600px auto; } - } - @media (max-width: 359px) { - .site-header { - background-size: 360px auto; + @media (max-width: 767px) { + .site-header { + background-size: 768px auto; + } + } + @media (max-width: 359px) { + .site-header { + background-size: 360px auto; + } } - } <?php endif; // Has the text been hidden? - if ( ! display_header_text() ) : + if ( ! display_header_text() ) : ?> - .site-title, - .site-description { - position: absolute; - clip: rect(1px 1px 1px 1px); /* IE7 */ - clip: rect(1px, 1px, 1px, 1px); - } + .site-title, + .site-description { + position: absolute; + clip: rect(1px 1px 1px 1px); /* IE7 */ + clip: rect(1px, 1px, 1px, 1px); + } <?php - if ( empty( $header_image ) ) : + if ( empty( $header_image ) ) : ?> - .site-header .home-link { - min-height: 0; - } + .site-header .home-link { + min-height: 0; + } <?php - endif; + endif; // If the user has set a custom color for the text, use that. elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) : @@ -164,8 +161,7 @@ function twentythirteen_admin_header_style() { <?php if ( ! empty( $header_image ) ) { echo 'background: url(' . esc_url( $header_image ) . ') no-repeat scroll top; background-size: 1600px auto;'; - } - ?> + } ?> padding: 0 20px; } #headimg .home-link { @@ -177,8 +173,7 @@ function twentythirteen_admin_header_style() { <?php if ( ! empty( $header_image ) || display_header_text() ) { echo 'min-height: 230px;'; - } - ?> + } ?> width: 100%; } <?php if ( ! display_header_text() ) : ?> @@ -232,5 +227,4 @@ function twentythirteen_admin_header_image() { <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2> </div> </div> -<?php -} +<?php } diff --git a/wp-content/themes/twentythirteen/index.php b/wp-content/themes/twentythirteen/index.php index aa78669d8..1fe9b550d 100644 --- a/wp-content/themes/twentythirteen/index.php +++ b/wp-content/themes/twentythirteen/index.php @@ -21,10 +21,7 @@ get_header(); ?> <?php if ( have_posts() ) : ?> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> diff --git a/wp-content/themes/twentythirteen/js/functions.js b/wp-content/themes/twentythirteen/js/functions.js index 1b18180c2..88e8d0b5a 100644 --- a/wp-content/themes/twentythirteen/js/functions.js +++ b/wp-content/themes/twentythirteen/js/functions.js @@ -75,11 +75,9 @@ } )(); /** - * Add or remove ARIA attributes. - * + * @summary Add or remove ARIA attributes. * Uses jQuery's width() function to determine the size of the window and add * the default ARIA attributes for the menu toggle if it's visible. - * * @since Twenty Thirteen 1.5 */ function onResizeARIA() { diff --git a/wp-content/themes/twentythirteen/page.php b/wp-content/themes/twentythirteen/page.php index 907a73586..554536772 100644 --- a/wp-content/themes/twentythirteen/page.php +++ b/wp-content/themes/twentythirteen/page.php @@ -17,10 +17,7 @@ get_header(); ?> <div id="content" class="site-content" role="main"> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <header class="entry-header"> @@ -35,16 +32,7 @@ get_header(); ?> <div class="entry-content"> <?php the_content(); ?> - <?php - wp_link_pages( - array( - 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', - 'after' => '</div>', - 'link_before' => '<span>', - 'link_after' => '</span>', - ) - ); -?> + <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?> </div><!-- .entry-content --> <footer class="entry-meta"> @@ -59,4 +47,4 @@ get_header(); ?> </div><!-- #primary --> <?php get_sidebar(); ?> -<?php get_footer(); ?> +<?php get_footer(); ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/readme.txt b/wp-content/themes/twentythirteen/readme.txt index 5624c54f6..749e92670 100644 --- a/wp-content/themes/twentythirteen/readme.txt +++ b/wp-content/themes/twentythirteen/readme.txt @@ -2,7 +2,7 @@ Contributors: the WordPress team Requires at least: WordPress 3.6 Tested up to: WordPress 5.0-trunk -Stable tag: 2.4 +Stable tag: 2.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: blog, one-column, two-columns, right-sidebar, custom-header, custom-menu, editor-style, featured-images, footer-widgets, microformats, post-formats, rtl-language-support, sticky-post, translation-ready, accessibility-ready @@ -47,6 +47,11 @@ Source: http://www.genericons.com == Changelog == += 2.5 = +* Released: December 6, 2018 + +https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_2.5 + = 2.4 = * Released: May 17, 2018 diff --git a/wp-content/themes/twentythirteen/search.php b/wp-content/themes/twentythirteen/search.php index a9e073e98..1519c1376 100644 --- a/wp-content/themes/twentythirteen/search.php +++ b/wp-content/themes/twentythirteen/search.php @@ -19,10 +19,7 @@ get_header(); ?> </header> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> @@ -36,4 +33,4 @@ get_header(); ?> </div><!-- #primary --> <?php get_sidebar(); ?> -<?php get_footer(); ?> +<?php get_footer(); ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/sidebar-main.php b/wp-content/themes/twentythirteen/sidebar-main.php index c404b0650..3c700addd 100644 --- a/wp-content/themes/twentythirteen/sidebar-main.php +++ b/wp-content/themes/twentythirteen/sidebar-main.php @@ -15,4 +15,4 @@ if ( is_active_sidebar( 'sidebar-1' ) ) : ?> <?php dynamic_sidebar( 'sidebar-1' ); ?> </div><!-- .widget-area --> </div><!-- #secondary --> -<?php endif; ?> +<?php endif; ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/sidebar.php b/wp-content/themes/twentythirteen/sidebar.php index 874554d74..cb5cf98e9 100644 --- a/wp-content/themes/twentythirteen/sidebar.php +++ b/wp-content/themes/twentythirteen/sidebar.php @@ -19,4 +19,4 @@ if ( is_active_sidebar( 'sidebar-2' ) ) : ?> </div><!-- .widget-area --> </div><!-- .sidebar-inner --> </div><!-- #tertiary --> -<?php endif; ?> +<?php endif; ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/single.php b/wp-content/themes/twentythirteen/single.php index 98dec5b2b..1694a0dcf 100644 --- a/wp-content/themes/twentythirteen/single.php +++ b/wp-content/themes/twentythirteen/single.php @@ -13,10 +13,7 @@ get_header(); ?> <div id="content" class="site-content" role="main"> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php twentythirteen_post_nav(); ?> @@ -28,4 +25,4 @@ get_header(); ?> </div><!-- #primary --> <?php get_sidebar(); ?> -<?php get_footer(); ?> +<?php get_footer(); ?> \ No newline at end of file diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css index 4dbecf43f..70ef87863 100644 --- a/wp-content/themes/twentythirteen/style.css +++ b/wp-content/themes/twentythirteen/style.css @@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentythirteen/ Author: the WordPress team Author URI: https://wordpress.org/ Description: The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small. -Version: 2.4 +Version: 2.5 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: blog, one-column, two-columns, right-sidebar, custom-header, custom-menu, editor-style, featured-images, footer-widgets, microformats, post-formats, rtl-language-support, sticky-post, translation-ready, accessibility-ready diff --git a/wp-content/themes/twentythirteen/tag.php b/wp-content/themes/twentythirteen/tag.php index 18a5a71c4..f00180d3b 100644 --- a/wp-content/themes/twentythirteen/tag.php +++ b/wp-content/themes/twentythirteen/tag.php @@ -26,10 +26,7 @@ get_header(); ?> </header><!-- .archive-header --> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> diff --git a/wp-content/themes/twentythirteen/taxonomy-post_format.php b/wp-content/themes/twentythirteen/taxonomy-post_format.php index 6538d0d6d..3cf2970ee 100644 --- a/wp-content/themes/twentythirteen/taxonomy-post_format.php +++ b/wp-content/themes/twentythirteen/taxonomy-post_format.php @@ -24,10 +24,7 @@ get_header(); ?> </header><!-- .archive-header --> <?php /* The loop */ ?> - <?php - while ( have_posts() ) : - the_post(); -?> + <?php while ( have_posts() ) : the_post(); ?> <?php get_template_part( 'content', get_post_format() ); ?> <?php endwhile; ?> -- GitLab