From a2547a8e6058633e689b3a6e19fbd9ca4c03da8d Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Sun, 9 Dec 2018 12:18:51 -0800
Subject: [PATCH] [auto] theme: twentytwelve 2.6
---
wp-content/themes/twentytwelve/404.php | 2 +-
wp-content/themes/twentytwelve/archive.php | 13 +-
wp-content/themes/twentytwelve/author.php | 8 +-
wp-content/themes/twentytwelve/category.php | 3 +-
wp-content/themes/twentytwelve/comments.php | 25 +-
.../themes/twentytwelve/content-page.php | 9 +-
wp-content/themes/twentytwelve/content.php | 15 +-
wp-content/themes/twentytwelve/css/blocks.css | 408 ++++++++++++++++
.../themes/twentytwelve/css/editor-blocks.css | 442 ++++++++++++++++++
wp-content/themes/twentytwelve/footer.php | 2 +-
wp-content/themes/twentytwelve/functions.php | 420 +++++++++--------
wp-content/themes/twentytwelve/header.php | 11 +-
wp-content/themes/twentytwelve/image.php | 63 +--
.../themes/twentytwelve/inc/custom-header.php | 31 +-
wp-content/themes/twentytwelve/index.php | 11 +-
.../page-templates/front-page.php | 7 +-
.../page-templates/full-width.php | 7 +-
wp-content/themes/twentytwelve/page.php | 7 +-
wp-content/themes/twentytwelve/readme.txt | 7 +-
wp-content/themes/twentytwelve/search.php | 7 +-
.../themes/twentytwelve/sidebar-front.php | 5 +-
wp-content/themes/twentytwelve/sidebar.php | 2 +-
wp-content/themes/twentytwelve/single.php | 7 +-
wp-content/themes/twentytwelve/style.css | 2 +-
wp-content/themes/twentytwelve/tag.php | 3 +-
25 files changed, 1144 insertions(+), 373 deletions(-)
create mode 100644 wp-content/themes/twentytwelve/css/blocks.css
create mode 100644 wp-content/themes/twentytwelve/css/editor-blocks.css
diff --git a/wp-content/themes/twentytwelve/404.php b/wp-content/themes/twentytwelve/404.php
index 8b039ecee..db3ef811b 100644
--- a/wp-content/themes/twentytwelve/404.php
+++ b/wp-content/themes/twentytwelve/404.php
@@ -26,4 +26,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/twentytwelve/archive.php b/wp-content/themes/twentytwelve/archive.php
index cf0611c45..78314cfb8 100644
--- a/wp-content/themes/twentytwelve/archive.php
+++ b/wp-content/themes/twentytwelve/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', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+ <h1 class="archive-title"><?php
+ if ( is_day() ) :
+ printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
elseif ( is_month() ) :
printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
elseif ( is_year() ) :
@@ -35,14 +34,12 @@ get_header(); ?>
else :
_e( 'Archives', 'twentytwelve' );
endif;
- ?>
- </h1>
+ ?></h1>
</header><!-- .archive-header -->
<?php
/* Start the Loop */
- while ( have_posts() ) :
- the_post();
+ while ( have_posts() ) : the_post();
/* Include the post format-specific template for the content. If you want to
* this in a child theme then include a file called content-___.php
diff --git a/wp-content/themes/twentytwelve/author.php b/wp-content/themes/twentytwelve/author.php
index ace43e7bd..9a55c3419 100644
--- a/wp-content/themes/twentytwelve/author.php
+++ b/wp-content/themes/twentytwelve/author.php
@@ -44,8 +44,7 @@ get_header(); ?>
<?php
// If a user has filled out their description, show a bio on their entries.
- if ( get_the_author_meta( 'description' ) ) :
- ?>
+ if ( get_the_author_meta( 'description' ) ) : ?>
<div class="author-info">
<div class="author-avatar">
<?php
@@ -68,10 +67,7 @@ get_header(); ?>
<?php endif; ?>
<?php /* Start 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/twentytwelve/category.php b/wp-content/themes/twentytwelve/category.php
index 0625a7d6c..458063066 100644
--- a/wp-content/themes/twentytwelve/category.php
+++ b/wp-content/themes/twentytwelve/category.php
@@ -27,8 +27,7 @@ get_header(); ?>
<?php
/* Start the Loop */
- while ( have_posts() ) :
- the_post();
+ while ( have_posts() ) : the_post();
/* Include the post format-specific template for the content. If you want to
* this in a child theme then include a file called content-___.php
diff --git a/wp-content/themes/twentytwelve/comments.php b/wp-content/themes/twentytwelve/comments.php
index 19f5941da..d6a733efe 100644
--- a/wp-content/themes/twentytwelve/comments.php
+++ b/wp-content/themes/twentytwelve/comments.php
@@ -17,9 +17,8 @@
* 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">
@@ -29,22 +28,13 @@ if ( post_password_required() ) {
<?php if ( have_comments() ) : ?>
<h2 class="comments-title">
<?php
- printf(
- _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentytwelve' ),
- number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
- );
+ printf( _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentytwelve' ),
+ number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
?>
</h2>
<ol class="commentlist">
- <?php
- wp_list_comments(
- array(
- 'callback' => 'twentytwelve_comment',
- 'style' => 'ol',
- )
- );
-?>
+ <?php wp_list_comments( array( 'callback' => 'twentytwelve_comment', 'style' => 'ol' ) ); ?>
</ol><!-- .commentlist -->
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -59,13 +49,12 @@ if ( post_password_required() ) {
/* If there are no comments and comments are closed, let's leave a note.
* But we only want the note on posts and pages that had comments in the first place.
*/
- if ( ! comments_open() && get_comments_number() ) :
- ?>
- <p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
+ if ( ! comments_open() && get_comments_number() ) : ?>
+ <p class="nocomments"><?php _e( 'Comments are closed.' , 'twentytwelve' ); ?></p>
<?php endif; ?>
<?php endif; // have_comments() ?>
<?php comment_form(); ?>
-</div><!-- #comments .comments-area -->
+</div><!-- #comments .comments-area -->
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/content-page.php b/wp-content/themes/twentytwelve/content-page.php
index d1553444b..0abcbf791 100644
--- a/wp-content/themes/twentytwelve/content-page.php
+++ b/wp-content/themes/twentytwelve/content-page.php
@@ -18,14 +18,7 @@
<div class="entry-content">
<?php the_content(); ?>
- <?php
- wp_link_pages(
- array(
- 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
- 'after' => '</div>',
- )
- );
-?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<footer class="entry-meta">
<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/wp-content/themes/twentytwelve/content.php b/wp-content/themes/twentytwelve/content.php
index 901b9bd87..56493ed0b 100644
--- a/wp-content/themes/twentytwelve/content.php
+++ b/wp-content/themes/twentytwelve/content.php
@@ -17,11 +17,9 @@
</div>
<?php endif; ?>
<header class="entry-header">
- <?php
- if ( ! post_password_required() && ! is_attachment() ) :
+ <?php if ( ! post_password_required() && ! is_attachment() ) :
the_post_thumbnail();
- endif;
- ?>
+ endif; ?>
<?php if ( is_single() ) : ?>
<h1 class="entry-title"><?php the_title(); ?></h1>
@@ -44,14 +42,7 @@
<?php else : ?>
<div class="entry-content">
<?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?>
- <?php
- wp_link_pages(
- array(
- 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
- 'after' => '</div>',
- )
- );
-?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php endif; ?>
diff --git a/wp-content/themes/twentytwelve/css/blocks.css b/wp-content/themes/twentytwelve/css/blocks.css
new file mode 100644
index 000000000..f19748190
--- /dev/null
+++ b/wp-content/themes/twentytwelve/css/blocks.css
@@ -0,0 +1,408 @@
+/*
+Theme Name: Twenty Twelve
+Description: Used to style Gutenberg Blocks.
+*/
+
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+1.0 General Block Styles
+2.0 Blocks - Common Blocks
+3.0 Blocks - Formatting
+4.0 Blocks - Layout Elements
+5.0 Blocks - Widgets
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+1.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Captions */
+
+[class^="wp-block-"] figcaption {
+ color: #757575;
+ font-size: 12px;
+ font-size: 0.857142857rem;
+ line-height: 2;
+ font-style: italic;
+ text-align: left;
+}
+
+[class^="wp-block-"].alignleft,
+[class^="wp-block-"] .alignleft {
+ margin-right: 24px;
+}
+
+[class^="wp-block-"].alignright,
+[class^="wp-block-"] .alignright {
+ margin-left: 24px;
+}
+
+.rtl [class^="wp-block-"] figcaption {
+ text-align: right;
+}
+
+/*--------------------------------------------------------------
+2.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+p.has-drop-cap:not(:focus)::first-letter {
+ font-size: 5em;
+ margin-top: 0.1em;
+}
+
+/* Image */
+
+.wp-block-image figure:not(.aligncenter) {
+ line-height: 0;
+ margin: 0 1.714285714rem;
+}
+
+.wp-block-image figure.alignleft {
+ margin: 0.857142857rem 1.714285714rem 0.857142857rem 0;
+}
+
+.wp-block-image figure.alignright {
+ margin: 0.857142857rem 0 0.857142857rem 1.714285714rem;
+}
+
+.wp-block-image figcaption {
+ padding-top: 0.75em;
+}
+
+[class^="wp-block-"].alignleft,
+[class^="wp-block-"] .alignleft,
+[class^="wp-block-"].alignright,
+[class^="wp-block-"] .alignright {
+
+}
+
+/* Gallery */
+
+.wp-block-gallery {
+ margin-bottom: 24px;
+ margin-bottom: 1.714285714rem;
+}
+
+.wp-block-gallery .blocks-gallery-image figcaption,
+.wp-block-gallery .blocks-gallery-item figcaption {
+ left: 0;
+ right: 0;
+ text-align: center;
+ width: auto;
+}
+
+/* Quote */
+
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+ border: 0;
+ padding: 1.714285714rem;
+ padding: 24px;
+}
+
+.wp-block-quote {
+ padding: 1.714285714rem;
+ padding: 24px;
+}
+
+.wp-block-quote cite {
+ color: inherit;
+ font-size: inherit;
+ font-style: italic;
+}
+
+.wp-block-quote.is-large p,
+.wp-block-quote.is-style-large p {
+ font-size: 20px;
+}
+
+/* Audio */
+
+.wp-block-audio audio {
+ display: block;
+ margin-bottom: 1.714285714rem;
+ width: 100%;
+}
+
+/* Cover */
+
+.wp-block-cover-image.aligncenter,
+.wp-block-cover.aligncenter {
+ display: flex;
+}
+
+/* File */
+
+.wp-block-file .wp-block-file__button {
+ background-color: #e6e6e6;
+ background-repeat: repeat-x;
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+ border: 1px solid #d2d2d2;
+ border-radius: 3px;
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+ color: #7c7c7c;
+ font-family: inherit;
+ font-size: 11px;
+ font-size: 0.785714286rem;
+ font-weight: normal;
+ line-height: 1.428571429;
+ padding: 6px 10px;
+ padding: 0.428571429rem 0.714285714rem;
+}
+
+.wp-block-file .wp-block-file__button:hover,
+.wp-block-file .wp-block-file__button:focus {
+ background-color: #ebebeb;
+ background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+ background-repeat: repeat-x;
+ color: #5e5e5e;
+}
+
+.wp-block-file .wp-block-file__button:focus {
+ background-color: #e1e1e1;
+ background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+ background-repeat: repeat-x;
+ border-color: transparent;
+ box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
+ color: #757575;
+}
+
+.rtl .wp-block-file * + .wp-block-file__button {
+ margin-left: 0.75em;
+ margin-right: 0;
+}
+
+/* Video */
+
+.wp-block-video video:not(:last-child) {
+ margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Formatting
+--------------------------------------------------------------*/
+
+/* Code */
+
+pre.wp-block-code {
+ border: 0;
+ padding: 0;
+}
+
+/* Pullquote */
+
+.wp-block-pullquote__citation,
+.wp-block-pullquote cite,
+.wp-block-pullquote footer {
+ font-size: 14px;
+ text-transform: none;
+}
+
+/* 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;
+ padding: 6px 10px 6px 0;
+ text-transform: uppercase;
+}
+
+.wp-block-table td {
+ border: 0;
+ border-top: 1px solid #ededed;
+ padding: 6px 10px 6px 0;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link,
+.wp-block-button .wp-block-button__link:visited {
+ background-color: #e6e6e6;
+ background-repeat: repeat-x;
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+ border: 1px solid #d2d2d2;
+ border-radius: 3px;
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+ color: #7c7c7c;
+ font-family: inherit;
+ font-size: 11px;
+ font-size: 0.785714286rem;
+ font-weight: normal;
+ line-height: 1.428571429;
+ padding: 6px 10px;
+ padding: 0.428571429rem 0.714285714rem;
+}
+
+.wp-block-button .wp-block-button__link:hover,
+.wp-block-button .wp-block-button__link:focus {
+ background-color: #ebebeb;
+ background-image: -moz-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -ms-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -webkit-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
+ background-image: linear-gradient(top, #f9f9f9, #ebebeb);
+ background-repeat: repeat-x;
+ color: #5e5e5e;
+}
+
+.wp-block-button .wp-block-button__link:active {
+ background-color: #e1e1e1;
+ background-image: -moz-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -ms-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -webkit-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: -o-linear-gradient(top, #ebebeb, #e1e1e1);
+ background-image: linear-gradient(top, #ebebeb, #e1e1e1);
+ background-repeat: repeat-x;
+ border-color: transparent;
+ box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4;
+ color: #757575;
+}
+
+/* Separator */
+
+.wp-block-separator {
+ border: 0;
+}
+
+/* Media & Text */
+
+.wp-block-media-text {
+ margin-bottom: 24px;
+ margin-bottom: 1.714285714rem;
+}
+
+.wp-block-media-text *:last-child {
+ margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+5.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;
+ box-shadow: none;
+}
+
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-excerpt,
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-meta {
+ margin-left: 60px;
+}
+
+.wp-block-latest-comments__comment,
+.wp-block-latest-comments__comment-excerpt,
+.wp-block-latest-comments__comment-excerpt p {
+ font-size: 14px;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+ margin-bottom: 0;
+}
+
+.wp-block-latest-comments__comment-date {
+ color: #5e5e5e;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+ margin: 0;
+ padding: 24px 0;
+ padding: 1.714285714rem 0 0;
+}
+
+.wp-block-latest-comments article {
+ margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+6.0 Blocks - Colors
+--------------------------------------------------------------*/
+
+.has-blue-color {
+ color: #21759b;
+}
+
+.has-blue-background-color {
+ background-color: #21759b;
+}
+
+.has-dark-gray-color {
+ color: #373737;
+}
+
+.has-dark-gray-background-color {
+ background-color: #373737;
+}
+
+.has-medium-gray-color {
+ color: #9f9f9f;
+}
+
+.has-medium-gray-background-color {
+ background-color: #9f9f9f;
+}
+
+.has-light-gray-color {
+ color: #e6e6e6;
+}
+
+.has-light-gray-background-color {
+ background-color: #e6e6e6;
+}
+
+.has-white-color {
+ color: #fff;
+}
+
+.has-white-background-color {
+ background-color: #fff;
+}
diff --git a/wp-content/themes/twentytwelve/css/editor-blocks.css b/wp-content/themes/twentytwelve/css/editor-blocks.css
new file mode 100644
index 000000000..7b40361ed
--- /dev/null
+++ b/wp-content/themes/twentytwelve/css/editor-blocks.css
@@ -0,0 +1,442 @@
+/*
+Theme Name: Twenty Twelve
+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 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-size: 14px;
+}
+
+.editor-default-block-appender input[type="text"].editor-default-block-appender__content {
+ font-family: "Open Sans", Helvetica, Arial, sans-serif;
+}
+
+.edit-post-visual-editor .editor-block-list__block {
+ color: #444;
+}
+
+.editor-post-title__block .editor-post-title__input {
+ font-family: "Open Sans", Helvetica, Arial, sans-serif;
+ font-size: 20px;
+ font-weight: 400;
+}
+
+@media screen and (min-width: 600px) {
+ .editor-post-title__block .editor-post-title__input {
+ font-size: 22px;
+ }
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h1 {
+ font-size: 21px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h2 {
+ font-size: 18px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h3 {
+ font-size: 16px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h4 {
+ font-size: 14px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h5 {
+ font-size: 13px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce h6 {
+ font-size: 12px;
+}
+
+/*--------------------------------------------------------------
+2.0 General Block Styles
+--------------------------------------------------------------*/
+
+/* Main column width */
+
+.wp-block {
+ max-width: 655px; /* 625px + 30px for padding */
+}
+
+/* Link styles */
+
+.edit-post-visual-editor a,
+.editor-block-list__block a,
+.wp-block-freeform.block-library-rich-text__tinymce a {
+ color: #21759b;
+}
+
+/* List styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce ol,
+.wp-block-freeform.block-library-rich-text__tinymce ul:not(.wp-block-gallery),
+.block-library-list ol.editor-rich-text__tinymce,
+.block-library-list ul.editor-rich-text__tinymce:not(.wp-block-gallery) {
+ padding-left: 0;
+ padding-right: 0;
+}
+
+/* Quote styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce blockquote {
+ border: 0;
+ font-style: italic;
+ padding: 24px;
+}
+
+/* Table styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce th {
+ font-size: 11px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce td {
+ font-size: 12px;
+}
+
+.wp-block-freeform.block-library-rich-text__tinymce th,
+.wp-block-freeform.block-library-rich-text__tinymce td {
+ padding-left: 0;
+ padding-right: 0;
+}
+
+.rtl .wp-block-freeform.block-library-rich-text__tinymce th,
+.rtl .wp-block-freeform.block-library-rich-text__tinymce td {
+ text-align: right;
+}
+
+/* Code styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce code {
+ background-color: transparent;
+ font-size: 12px;
+}
+
+/* Pre styles */
+
+.wp-block-freeform.block-library-rich-text__tinymce pre {
+ font-size: 12px;
+}
+
+/* Captions */
+
+[class^="wp-block-"] figcaption,
+[class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body {
+ color: #757575;
+ font-size: 12px;
+ line-height: 2;
+ font-style: italic;
+ text-align: left;
+}
+
+.rtl [class^="wp-block-"] figcaption,
+.rtl [class^="wp-block-"] figcaption.editor-rich-text__tinymce.mce-content-body {
+ text-align: right;
+}
+
+/* Definition Lists */
+
+.wp-block-freeform.block-library-rich-text__tinymce dt {
+ margin-bottom: 0;
+}
+
+/*--------------------------------------------------------------
+3.0 Blocks - Common Blocks
+--------------------------------------------------------------*/
+
+/* Paragraph */
+
+p.has-drop-cap:not(:focus)::first-letter {
+ font-size: 5em;
+ margin-top: 0.1em;
+}
+
+/* Image */
+
+.wp-block-image {
+ margin-left: 0;
+ margin-right: 0;
+}
+
+/* Gallery */
+
+.wp-block-gallery {
+ margin-bottom: 24px;
+}
+
+.wp-block-gallery figcaption,
+.wp-block-gallery figcaption.editor-rich-text__tinymce.mce-content-body {
+ color: #fff;
+ text-align: center;
+}
+
+/* Quote */
+
+.wp-block-quote,
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+ padding: 24px;
+}
+
+.wp-block-quote p {
+ font-style: italic;
+}
+
+.wp-block-quote:not(.is-large):not(.is-style-large) {
+ border: 0;
+}
+
+.wp-block-quote.is-large p,
+.wp-block-quote.is-style-large p {
+ font-size: 20px;
+}
+
+.wp-block-quote .wp-block-quote__citation {
+ color: inherit;
+ font-style: italic;
+}
+
+.wp-block-quote.is-large .wp-block-quote__citation,
+.wp-block-quote.is-style-large .wp-block-quote__citation {
+ font-size: 18px;
+}
+
+/* Cover */
+
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image p,
+.edit-post-visual-editor .editor-block-list__block .wp-block-cover p {
+ font-size: 28px;
+}
+
+/* File */
+
+.wp-block-file .wp-block-file__textlink {
+ color: #21759b;
+ text-decoration: underline;
+}
+
+.wp-block-file .wp-block-file__button,
+.wp-block-button .wp-block-button__link:hover {
+ background-color: #e6e6e6;
+ background-repeat: repeat-x;
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+ border: 1px solid #d2d2d2;
+ border-radius: 3px;
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+ color: #7c7c7c;
+ font-family: inherit;
+ font-size: 11px;
+ font-weight: normal;
+ line-height: 1.428571429;
+ padding: 6px 10px;
+}
+
+/*--------------------------------------------------------------
+4.0 Blocks - Formatting
+--------------------------------------------------------------*/
+
+/* Verse */
+
+.editor-block-list__block .wp-block-verse pre {
+ font-size: 12px;
+}
+
+/* Code */
+
+.wp-block-code {
+ border: 0;
+ font-size: 12px;
+ line-height: 2;
+ padding: 0;
+}
+
+.wp-block-html .CodeMirror-sizer {
+ line-height: 1.7;
+}
+
+/* Preformatted */
+
+.editor-block-list__block .wp-block-preformatted pre {
+ font-size: 12px;
+}
+
+/* Pullquote */
+
+.wp-block-pullquote {
+ font-style: italic;
+}
+
+.edit-post-visual-editor .wp-block-pullquote {
+ margin: 0;
+}
+
+.wp-block-pullquote .wp-block-pullquote__citation,
+.wp-block-pullquote cite {
+ font-size: 14px;
+ text-transform: none;
+}
+
+/* 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%;
+}
+
+.editor-block-list__block .wp-block-table th {
+ border: 0;
+ font-size: 11px;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+
+.editor-block-list__block .wp-block-table td {
+ border: 0;
+ border-top: 1px solid #ededed;
+ font-size: 12px;
+ padding: 0;
+}
+
+.wp-block-table__cell-content {
+ padding: 6px 10px 6px 0;
+}
+
+/*--------------------------------------------------------------
+5.0 Blocks - Layout Elements
+--------------------------------------------------------------*/
+
+/* Buttons */
+
+.wp-block-button .wp-block-button__link,
+.wp-block-button .wp-block-button__link:hover {
+ background-color: #e6e6e6;
+ background-repeat: repeat-x;
+ background-image: -moz-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -ms-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -webkit-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
+ background-image: linear-gradient(top, #f4f4f4, #e6e6e6);
+ border: 1px solid #d2d2d2;
+ border-radius: 3px;
+ box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1);
+ color: #7c7c7c;
+ font-family: inherit;
+ font-size: 11px;
+ font-weight: normal;
+ line-height: 1.428571429;
+ padding: 6px 10px;
+}
+
+/* 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;
+}
+
+/*--------------------------------------------------------------
+6.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;
+}
+
+/* Archives */
+
+.gutenberg ul.wp-block-archives {
+ padding-left: 0;
+}
+
+/* Categories */
+
+.gutenberg .wp-block-categories ul {
+ padding-left: 0;
+}
+
+/* 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;
+ box-shadow: none;
+}
+
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-excerpt,
+.has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-meta {
+ margin-left: 60px;
+}
+
+.wp-block-latest-comments__comment,
+.wp-block-latest-comments__comment-excerpt,
+.wp-block-latest-comments__comment-excerpt p {
+ font-size: 14px;
+}
+
+.wp-block-latest-comments__comment-excerpt p:last-child {
+ margin-bottom: 0;
+}
+
+.wp-block-latest-comments__comment-date {
+ color: #5e5e5e;
+}
+
+.wp-block-latest-comments .wp-block-latest-comments__comment {
+ margin: 0;
+ padding: 24px 0;
+}
+
+.wp-block-latest-comments article {
+ border-bottom: 4px double #ededed;
+ padding-bottom: 2em;
+}
+
+/* Latest Posts */
+
+.gutenberg .wp-block-latest-posts {
+ padding-left: 0;
+ padding-right: 0;
+}
diff --git a/wp-content/themes/twentytwelve/footer.php b/wp-content/themes/twentytwelve/footer.php
index 05e52e2bd..1ea06058f 100644
--- a/wp-content/themes/twentytwelve/footer.php
+++ b/wp-content/themes/twentytwelve/footer.php
@@ -27,4 +27,4 @@
<?php wp_footer(); ?>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index 31fc28204..8df145ab8 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -23,9 +23,8 @@
*/
// Set up the content width value based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) ) {
+if ( ! isset( $content_width ) )
$content_width = 625;
-}
/**
* Twenty Twelve setup.
@@ -36,7 +35,7 @@ if ( ! isset( $content_width ) ) {
* @uses load_theme_textdomain() For translation/localization support.
* @uses add_editor_style() To add a Visual Editor stylesheet.
* @uses add_theme_support() To add support for post thumbnails, automatic feed links,
- * custom background, and post formats.
+ * custom background, and post formats.
* @uses register_nav_menu() To add support for navigation menus.
* @uses set_post_thumbnail_size() To set a custom post thumbnail size.
*
@@ -55,6 +54,44 @@ function twentytwelve_setup() {
// This theme styles the visual editor with editor-style.css to match the theme style.
add_editor_style();
+ // 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 responsive embeds.
+ add_theme_support( 'responsive-embeds' );
+
+ // Add support for custom color scheme.
+ add_theme_support( 'editor-color-palette', array(
+ array(
+ 'name' => __( 'Blue', 'twentytwelve' ),
+ 'slug' => 'blue',
+ 'color' => '#21759b',
+ ),
+ array(
+ 'name' => __( 'Dark Gray', 'twentytwelve' ),
+ 'slug' => 'dark-gray',
+ 'color' => '#444',
+ ),
+ array(
+ 'name' => __( 'Medium Gray', 'twentytwelve' ),
+ 'slug' => 'medium-gray',
+ 'color' => '#9f9f9f',
+ ),
+ array(
+ 'name' => __( 'Light Gray', 'twentytwelve' ),
+ 'slug' => 'light-gray',
+ 'color' => '#e6e6e6',
+ ),
+ array(
+ 'name' => __( 'White', 'twentytwelve' ),
+ 'slug' => 'white',
+ 'color' => '#fff',
+ ),
+ ) );
+
// Adds RSS feed links to <head> for posts and comments.
add_theme_support( 'automatic-feed-links' );
@@ -68,11 +105,9 @@ function twentytwelve_setup() {
* This theme supports custom background color and image,
* and here we also set up the default background color.
*/
- add_theme_support(
- 'custom-background', array(
- 'default-color' => 'e6e6e6',
- )
- );
+ add_theme_support( 'custom-background', array(
+ 'default-color' => 'e6e6e6',
+ ) );
// This theme uses a custom image size for featured images, displayed on "standard" posts.
add_theme_support( 'post-thumbnails' );
@@ -112,19 +147,18 @@ function twentytwelve_get_font_url() {
*/
$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
- if ( 'cyrillic' == $subset ) {
+ if ( 'cyrillic' == $subset )
$subsets .= ',cyrillic,cyrillic-ext';
- } elseif ( 'greek' == $subset ) {
+ elseif ( 'greek' == $subset )
$subsets .= ',greek,greek-ext';
- } elseif ( 'vietnamese' == $subset ) {
+ elseif ( 'vietnamese' == $subset )
$subsets .= ',vietnamese';
- }
$query_args = array(
'family' => 'Open+Sans:400italic,700italic,400,700',
'subset' => $subsets,
);
- $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+ $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
}
return $font_url;
@@ -142,27 +176,41 @@ function twentytwelve_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 JavaScript for handling the navigation menu hide-and-show behavior.
wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
$font_url = twentytwelve_get_font_url();
- if ( ! empty( $font_url ) ) {
+ if ( ! empty( $font_url ) )
wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
- }
// Loads our main stylesheet.
wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
+ // Theme block stylesheet.
+ wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181018' );
+
// Loads the Internet Explorer specific stylesheet.
wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
$wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
}
add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
+/**
+ * Enqueue editor styles for Gutenberg
+ *
+ * @since Twenty Twelve 2.6
+ */
+function twentytwelve_block_editor_styles() {
+ // Block styles.
+ wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css' );
+ // Add custom fonts.
+ wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
+}
+add_action( 'enqueue_block_editor_assets', 'twentytwelve_block_editor_styles' );
+
/**
* Add preconnect for Google Fonts.
*
@@ -203,13 +251,11 @@ add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
function twentytwelve_mce_css( $mce_css ) {
$font_url = twentytwelve_get_font_url();
- if ( empty( $font_url ) ) {
+ if ( empty( $font_url ) )
return $mce_css;
- }
- if ( ! empty( $mce_css ) ) {
+ if ( ! empty( $mce_css ) )
$mce_css .= ',';
- }
$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
@@ -232,23 +278,20 @@ add_filter( 'mce_css', 'twentytwelve_mce_css' );
function twentytwelve_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', 'twentytwelve' ), max( $paged, $page ) );
- }
return $title;
}
@@ -262,9 +305,8 @@ add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
* @since Twenty Twelve 1.0
*/
function twentytwelve_page_menu_args( $args ) {
- if ( ! isset( $args['show_home'] ) ) {
+ if ( ! isset( $args['show_home'] ) )
$args['show_home'] = true;
- }
return $args;
}
add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
@@ -277,190 +319,168 @@ add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
* @since Twenty Twelve 1.0
*/
function twentytwelve_widgets_init() {
- register_sidebar(
- array(
- 'name' => __( 'Main Sidebar', 'twentytwelve' ),
- 'id' => 'sidebar-1',
- 'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
- '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' => __( 'First Front Page Widget Area', 'twentytwelve' ),
- 'id' => 'sidebar-2',
- 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
- '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' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
- 'id' => 'sidebar-3',
- 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
- '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 Sidebar', 'twentytwelve' ),
+ 'id' => 'sidebar-1',
+ 'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
+ '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' => __( 'First Front Page Widget Area', 'twentytwelve' ),
+ 'id' => 'sidebar-2',
+ 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+ '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' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
+ 'id' => 'sidebar-3',
+ 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+ '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', 'twentytwelve_widgets_init' );
if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
- /**
- * Displays navigation to next/previous pages when applicable.
- *
- * @since Twenty Twelve 1.0
- */
- function twentytwelve_content_nav( $html_id ) {
- global $wp_query;
-
- if ( $wp_query->max_num_pages > 1 ) : ?>
- <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
- <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentytwelve' ) ); ?></div>
- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?></div>
- </nav><!-- .navigation -->
- <?php
- endif;
- }
+/**
+ * Displays navigation to next/previous pages when applicable.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_content_nav( $html_id ) {
+ global $wp_query;
+
+ if ( $wp_query->max_num_pages > 1 ) : ?>
+ <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
+ <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
+ <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentytwelve' ) ); ?></div>
+ <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?></div>
+ </nav><!-- .navigation -->
+ <?php endif;
+}
endif;
if ( ! function_exists( 'twentytwelve_comment' ) ) :
- /**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentytwelve_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Twelve 1.0
- */
- function twentytwelve_comment( $comment, $args, $depth ) {
- $GLOBALS['comment'] = $comment;
- switch ( $comment->comment_type ) :
- case 'pingback':
- case 'trackback':
- // Display trackbacks differently than normal comments.
- ?>
- <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+/**
+ * Template for comments and pingbacks.
+ *
+ * To override this walker in a child theme without modifying the comments template
+ * simply create your own twentytwelve_comment(), and that function will be used instead.
+ *
+ * Used as a callback by wp_list_comments() for displaying the comments.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_comment( $comment, $args, $depth ) {
+ $GLOBALS['comment'] = $comment;
+ switch ( $comment->comment_type ) :
+ case 'pingback' :
+ case 'trackback' :
+ // Display trackbacks differently than normal comments.
+ ?>
+ <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
<?php
- break;
- default:
- // Proceed with normal comments.
- global $post;
- ?>
- <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+ break;
+ default :
+ // Proceed with normal comments.
+ global $post;
+ ?>
+ <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
<article id="comment-<?php comment_ID(); ?>" class="comment">
<header class="comment-meta comment-author vcard">
<?php
echo get_avatar( $comment, 44 );
- printf(
- '<cite><b class="fn">%1$s</b> %2$s</cite>',
+ printf( '<cite><b class="fn">%1$s</b> %2$s</cite>',
get_comment_author_link(),
// If current post author is also comment author, make it known visually.
( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
);
- printf(
- '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+ printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
esc_url( get_comment_link( $comment->comment_ID ) ),
get_comment_time( 'c' ),
/* translators: 1: date, 2: time */
sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
);
- ?>
- </header><!-- .comment-meta -->
+ ?>
+ </header><!-- .comment-meta -->
- <?php if ( '0' == $comment->comment_approved ) : ?>
+ <?php if ( '0' == $comment->comment_approved ) : ?>
<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
<?php endif; ?>
- <section class="comment-content comment">
+ <section class="comment-content comment">
<?php comment_text(); ?>
<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
- </section><!-- .comment-content -->
+ </section><!-- .comment-content -->
- <div class="reply">
- <?php
- comment_reply_link(
- array_merge(
- $args, array(
- 'reply_text' => __( 'Reply', 'twentytwelve' ),
- 'after' => ' <span>↓</span>',
- 'depth' => $depth,
- 'max_depth' => $args['max_depth'],
- )
- )
- );
-?>
- </div><!-- .reply -->
- </article><!-- #comment-## -->
- <?php
- break;
- endswitch; // end comment_type check
- }
+ <div class="reply">
+ <?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>↓</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+ </div><!-- .reply -->
+ </article><!-- #comment-## -->
+ <?php
+ break;
+ endswitch; // end comment_type check
+}
endif;
if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
- /**
- * Set up post entry meta.
- *
- * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
- *
- * Create your own twentytwelve_entry_meta() to override in a child theme.
- *
- * @since Twenty Twelve 1.0
- */
- function twentytwelve_entry_meta() {
- // Translators: used between list items, there is a space after the comma.
- $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
-
- // Translators: used between list items, there is a space after the comma.
- $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
-
- $date = sprintf(
- '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
- esc_url( get_permalink() ),
- esc_attr( get_the_time() ),
- esc_attr( get_the_date( 'c' ) ),
- esc_html( get_the_date() )
- );
-
- $author = sprintf(
- '<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', 'twentytwelve' ), get_the_author() ) ),
- get_the_author()
- );
+/**
+ * Set up post entry meta.
+ *
+ * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
+ *
+ * Create your own twentytwelve_entry_meta() to override in a child theme.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_entry_meta() {
+ // Translators: used between list items, there is a space after the comma.
+ $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+
+ // Translators: used between list items, there is a space after the comma.
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+
+ $date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
+ esc_url( get_permalink() ),
+ esc_attr( get_the_time() ),
+ esc_attr( get_the_date( 'c' ) ),
+ esc_html( get_the_date() )
+ );
- // Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
- if ( $tag_list ) {
- $utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
- } elseif ( $categories_list ) {
- $utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
- } else {
- $utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
- }
+ $author = sprintf( '<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', 'twentytwelve' ), get_the_author() ) ),
+ get_the_author()
+ );
- printf(
- $utility_text,
- $categories_list,
- $tag_list,
- $date,
- $author
- );
+ // Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
+ if ( $tag_list ) {
+ $utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+ } elseif ( $categories_list ) {
+ $utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+ } else {
+ $utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
}
+
+ printf(
+ $utility_text,
+ $categories_list,
+ $tag_list,
+ $date,
+ $author
+ );
+}
endif;
/**
@@ -484,36 +504,30 @@ function twentytwelve_body_class( $classes ) {
$background_color = get_background_color();
$background_image = get_background_image();
- if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) {
+ if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
$classes[] = 'full-width';
- }
if ( is_page_template( 'page-templates/front-page.php' ) ) {
$classes[] = 'template-front-page';
- if ( has_post_thumbnail() ) {
+ if ( has_post_thumbnail() )
$classes[] = 'has-post-thumbnail';
- }
- if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) {
+ if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
$classes[] = 'two-sidebars';
- }
}
if ( empty( $background_image ) ) {
- if ( empty( $background_color ) ) {
+ if ( empty( $background_color ) )
$classes[] = 'custom-background-empty';
- } elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
+ elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
$classes[] = 'custom-background-white';
- }
}
// Enable custom font class only if the font CSS is queued to load.
- if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) {
+ if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
$classes[] = 'custom-font-enabled';
- }
- if ( ! is_multi_author() ) {
+ if ( ! is_multi_author() )
$classes[] = 'single-author';
- }
return $classes;
}
@@ -550,20 +564,16 @@ function twentytwelve_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 > a',
- 'container_inclusive' => false,
- 'render_callback' => 'twentytwelve_customize_partial_blogname',
- )
- );
- $wp_customize->selective_refresh->add_partial(
- 'blogdescription', array(
- 'selector' => '.site-description',
- 'container_inclusive' => false,
- 'render_callback' => 'twentytwelve_customize_partial_blogdescription',
- )
- );
+ $wp_customize->selective_refresh->add_partial( 'blogname', array(
+ 'selector' => '.site-title > a',
+ 'container_inclusive' => false,
+ 'render_callback' => 'twentytwelve_customize_partial_blogname',
+ ) );
+ $wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+ 'selector' => '.site-description',
+ 'container_inclusive' => false,
+ 'render_callback' => 'twentytwelve_customize_partial_blogdescription',
+ ) );
}
}
add_action( 'customize_register', 'twentytwelve_customize_register' );
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 2b95b498e..c3b99d6f3 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -42,14 +42,7 @@
<nav id="site-navigation" class="main-navigation" role="navigation">
<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
- <?php
- wp_nav_menu(
- array(
- 'theme_location' => 'primary',
- 'menu_class' => 'nav-menu',
- )
- );
-?>
+ <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
</nav><!-- #site-navigation -->
<?php if ( get_header_image() ) : ?>
@@ -57,4 +50,4 @@
<?php endif; ?>
</header><!-- #masthead -->
- <div id="main" class="wrapper">
+ <div id="main" class="wrapper">
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/image.php b/wp-content/themes/twentytwelve/image.php
index d2d228ba6..976e017d5 100644
--- a/wp-content/themes/twentytwelve/image.php
+++ b/wp-content/themes/twentytwelve/image.php
@@ -14,10 +14,7 @@ get_header(); ?>
<div id="primary" class="site-content">
<div id="content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
<header class="entry-header">
@@ -26,8 +23,7 @@ get_header(); ?>
<footer class="entry-meta">
<?php
$metadata = wp_get_attachment_metadata();
- printf(
- __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s × %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
+ printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s × %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ),
esc_url( wp_get_attachment_url() ),
@@ -56,22 +52,10 @@ get_header(); ?>
* 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
*/
-$attachments = array_values(
- get_children(
- array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID',
- )
- )
-);
+$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
foreach ( $attachments as $k => $attachment ) :
- if ( $attachment->ID == $post->ID ) {
+ if ( $attachment->ID == $post->ID )
break;
- }
endforeach;
// If there is more than 1 attachment in a gallery
@@ -89,22 +73,20 @@ else :
$next_attachment_url = wp_get_attachment_url();
endif;
?>
- <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
- <?php
- /**
- * Filter the image attachment size to use.
- *
- * @since Twenty Twelve 1.0
- *
- * @param array $size {
- * @type int The attachment height in pixels.
- * @type int The attachment width in pixels.
- * }
- */
- $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
- echo wp_get_attachment_image( $post->ID, $attachment_size );
- ?>
- </a>
+ <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
+ /**
+ * Filter the image attachment size to use.
+ *
+ * @since Twenty Twelve 1.0
+ *
+ * @param array $size {
+ * @type int The attachment height in pixels.
+ * @type int The attachment width in pixels.
+ * }
+ */
+ $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
+ echo wp_get_attachment_image( $post->ID, $attachment_size );
+ ?></a>
<?php if ( ! empty( $post->post_excerpt ) ) : ?>
<div class="entry-caption">
@@ -117,14 +99,7 @@ endif;
<div class="entry-description">
<?php the_content(); ?>
- <?php
- wp_link_pages(
- array(
- 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
- 'after' => '</div>',
- )
- );
-?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-description -->
</div><!-- .entry-content -->
diff --git a/wp-content/themes/twentytwelve/inc/custom-header.php b/wp-content/themes/twentytwelve/inc/custom-header.php
index c243dc65a..baedf18b5 100644
--- a/wp-content/themes/twentytwelve/inc/custom-header.php
+++ b/wp-content/themes/twentytwelve/inc/custom-header.php
@@ -54,9 +54,8 @@ add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
*/
function twentytwelve_custom_header_fonts() {
$font_url = twentytwelve_get_font_url();
- if ( ! empty( $font_url ) ) {
+ if ( ! empty( $font_url ) )
wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
- }
}
add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
@@ -71,25 +70,24 @@ function twentytwelve_header_style() {
$text_color = get_header_textcolor();
// If no custom options for text are set, let's bail
- if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
+ if ( $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="twentytwelve-header-css">
<?php
// 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 the user has set a custom color for the text, use that.
+ // If the user has set a custom color for the text, use that.
else :
?>
.site-header h1 a,
@@ -157,12 +155,9 @@ function twentytwelve_admin_header_image() {
<div id="headimg">
<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
- <?php
- $header_image = get_header_image();
- if ( ! empty( $header_image ) ) :
- ?>
+ <?php $header_image = get_header_image();
+ if ( ! empty( $header_image ) ) : ?>
<img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
<?php endif; ?>
</div>
-<?php
-}
+<?php }
diff --git a/wp-content/themes/twentytwelve/index.php b/wp-content/themes/twentytwelve/index.php
index 47e5c6424..7420be53e 100644
--- a/wp-content/themes/twentytwelve/index.php
+++ b/wp-content/themes/twentytwelve/index.php
@@ -21,10 +21,7 @@ get_header(); ?>
<?php if ( have_posts() ) : ?>
<?php /* Start the Loop */ ?>
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?>
@@ -34,8 +31,7 @@ get_header(); ?>
<article id="post-0" class="post no-results not-found">
- <?php
- if ( current_user_can( 'edit_posts' ) ) :
+ <?php if ( current_user_can( 'edit_posts' ) ) :
// Show a different message to a logged-in user who can add posts.
?>
<header class="entry-header">
@@ -46,8 +42,7 @@ get_header(); ?>
<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
</div><!-- .entry-content -->
- <?php
- else :
+ <?php else :
// Show the default message to everyone else.
?>
<header class="entry-header">
diff --git a/wp-content/themes/twentytwelve/page-templates/front-page.php b/wp-content/themes/twentytwelve/page-templates/front-page.php
index 9561179a2..9ae4f27dd 100644
--- a/wp-content/themes/twentytwelve/page-templates/front-page.php
+++ b/wp-content/themes/twentytwelve/page-templates/front-page.php
@@ -17,10 +17,7 @@ get_header(); ?>
<div id="primary" class="site-content">
<div id="content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php if ( has_post_thumbnail() ) : ?>
<div class="entry-page-image">
<?php the_post_thumbnail(); ?>
@@ -35,4 +32,4 @@ get_header(); ?>
</div><!-- #primary -->
<?php get_sidebar( 'front' ); ?>
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/page-templates/full-width.php b/wp-content/themes/twentytwelve/page-templates/full-width.php
index 463d923d3..b0ce333c2 100644
--- a/wp-content/themes/twentytwelve/page-templates/full-width.php
+++ b/wp-content/themes/twentytwelve/page-templates/full-width.php
@@ -19,10 +19,7 @@ get_header(); ?>
<div id="primary" class="site-content">
<div id="content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', 'page' ); ?>
<?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?>
@@ -30,4 +27,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/twentytwelve/page.php b/wp-content/themes/twentytwelve/page.php
index 32934195d..b06cd1f20 100644
--- a/wp-content/themes/twentytwelve/page.php
+++ b/wp-content/themes/twentytwelve/page.php
@@ -17,10 +17,7 @@ get_header(); ?>
<div id="primary" class="site-content">
<div id="content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', 'page' ); ?>
<?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?>
@@ -29,4 +26,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/twentytwelve/readme.txt b/wp-content/themes/twentytwelve/readme.txt
index a6b1e6b87..ef92bef2d 100644
--- a/wp-content/themes/twentytwelve/readme.txt
+++ b/wp-content/themes/twentytwelve/readme.txt
@@ -2,7 +2,7 @@
Contributors: the WordPress team
Requires at least: WordPress 3.5
Tested up to: WordPress 5.0-trunk
-Stable tag: 2.5
+Stable tag: 2.6
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
@@ -43,6 +43,11 @@ Source: https://github.com/aFarkas/html5shiv
== Changelog ==
+= 2.6 =
+* Released: December 6, 2018
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.6
+
= 2.5 =
* Released: May 17, 2018
diff --git a/wp-content/themes/twentytwelve/search.php b/wp-content/themes/twentytwelve/search.php
index 9f4021706..97a309b12 100644
--- a/wp-content/themes/twentytwelve/search.php
+++ b/wp-content/themes/twentytwelve/search.php
@@ -21,10 +21,7 @@ get_header(); ?>
<?php twentytwelve_content_nav( 'nav-above' ); ?>
<?php /* Start the Loop */ ?>
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?>
@@ -49,4 +46,4 @@ get_header(); ?>
</section><!-- #primary -->
<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/sidebar-front.php b/wp-content/themes/twentytwelve/sidebar-front.php
index 5f1193537..990a09fec 100644
--- a/wp-content/themes/twentytwelve/sidebar-front.php
+++ b/wp-content/themes/twentytwelve/sidebar-front.php
@@ -15,9 +15,8 @@
*
* If none of the sidebars have widgets, then let's bail early.
*/
-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) {
+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
return;
-}
// If we get this far, we have widgets. Let do this.
?>
@@ -33,4 +32,4 @@ if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
<?php dynamic_sidebar( 'sidebar-3' ); ?>
</div><!-- .second -->
<?php endif; ?>
-</div><!-- #secondary -->
+</div><!-- #secondary -->
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/sidebar.php b/wp-content/themes/twentytwelve/sidebar.php
index ca9dbddb7..a59dcc49b 100644
--- a/wp-content/themes/twentytwelve/sidebar.php
+++ b/wp-content/themes/twentytwelve/sidebar.php
@@ -14,4 +14,4 @@
<div id="secondary" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'sidebar-1' ); ?>
</div><!-- #secondary -->
- <?php endif; ?>
+ <?php endif; ?>
\ No newline at end of file
diff --git a/wp-content/themes/twentytwelve/single.php b/wp-content/themes/twentytwelve/single.php
index 17a900c38..38175246f 100644
--- a/wp-content/themes/twentytwelve/single.php
+++ b/wp-content/themes/twentytwelve/single.php
@@ -12,10 +12,7 @@ get_header(); ?>
<div id="primary" class="site-content">
<div id="content" role="main">
- <?php
- while ( have_posts() ) :
- the_post();
-?>
+ <?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', get_post_format() ); ?>
@@ -33,4 +30,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/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index c5df75f42..4fd5be1a9 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
Author: the WordPress team
Author URI: https://wordpress.org/
Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 2.5
+Version: 2.6
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-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready
diff --git a/wp-content/themes/twentytwelve/tag.php b/wp-content/themes/twentytwelve/tag.php
index 515521c78..7715302ca 100644
--- a/wp-content/themes/twentytwelve/tag.php
+++ b/wp-content/themes/twentytwelve/tag.php
@@ -27,8 +27,7 @@ get_header(); ?>
<?php
/* Start the Loop */
- while ( have_posts() ) :
- the_post();
+ while ( have_posts() ) : the_post();
/*
* Include the post format-specific template for the content. If you want to
--
GitLab