diff --git a/404.php b/404.php index db3ef811b..8b039ecee 100644 --- a/404.php +++ b/404.php @@ -26,4 +26,4 @@ get_header(); ?> - \ No newline at end of file + diff --git a/archive.php b/archive.php index f71ecf90e..b44a1c6c9 100644 --- a/archive.php +++ b/archive.php @@ -10,7 +10,7 @@ * has tag.php for Tag archives, category.php for Category archives, and * author.php for Author archives. * - * @link https://codex.wordpress.org/Template_Hierarchy + * @link https://developer.wordpress.org/themes/basics/template-hierarchy/ * * @package WordPress * @subpackage Twenty_Twelve @@ -24,25 +24,32 @@ get_header(); ?>
-

' . get_the_date() . '' ); - elseif ( is_month() ) : - printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '' ); - elseif ( is_year() ) : - printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '' ); - else : - _e( 'Archives', 'twentytwelve' ); - endif; - ?>

+

+ ' . get_the_date() . '' ); + } elseif ( is_month() ) { + /* translators: %s: Date. */ + printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '' ); + } elseif ( is_year() ) { + /* translators: %s: Date. */ + printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '' ); + } else { + _e( 'Archives', 'twentytwelve' ); + } + ?> +

?>
-

' . get_the_author() . '' ); ?>

+

+ ' . get_the_author() . '' ); + ?> +

@@ -44,12 +51,13 @@ get_header(); ?> + if ( get_the_author_meta( 'description' ) ) : + ?>
?>
-

+

+ +

- - + diff --git a/category.php b/category.php index 02f132605..ec8ce43f9 100644 --- a/category.php +++ b/category.php @@ -4,7 +4,7 @@ * * Used to display archive-type pages for posts in a category. * - * @link https://codex.wordpress.org/Template_Hierarchy + * @link https://developer.wordpress.org/themes/basics/template-hierarchy/ * * @package WordPress * @subpackage Twenty_Twelve @@ -18,19 +18,26 @@ get_header(); ?>
-

' . single_cat_title( '', false ) . '' ); ?>

+

+ ' . single_cat_title( '', false ) . '' ); + ?> +

- +
@@ -28,33 +29,54 @@ if ( post_password_required() )

' . get_the_title() . '' ); + if ( 1 === get_comments_number() ) { + printf( + /* translators: %s: The post title. */ + __( 'One thought on “%s”', 'twentytwelve' ), + '' . get_the_title() . '' + ); + } else { + printf( + /* translators: %1$s: The number of comments. %2$s: The post title. */ + _n( '%1$s thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'twentytwelve' ), + number_format_i18n( get_comments_number() ), + '' . get_the_title() . '' + ); + } ?>

    - 'twentytwelve_comment', 'style' => 'ol' ) ); ?> + 'twentytwelve_comment', + 'style' => 'ol', + ) + ); + ?>
- 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> + 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?> - + -

+ if ( ! comments_open() && get_comments_number() ) : + ?> +

-
\ No newline at end of file + diff --git a/content-aside.php b/content-aside.php index 4a84ae76d..52990b2bf 100644 --- a/content-aside.php +++ b/content-aside.php @@ -6,6 +6,9 @@ * @subpackage Twenty_Twelve * @since Twenty Twelve 1.0 */ + +/* translators: %s: Post title. */ +$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>
> @@ -17,7 +20,7 @@
- + diff --git a/js/theme-customizer.js b/js/theme-customizer.js index 8bf094be5..46195fbce 100644 --- a/js/theme-customizer.js +++ b/js/theme-customizer.js @@ -18,7 +18,7 @@ } ); } ); - // Header text color + // Header text color. wp.customize( 'header_textcolor', function( value ) { value.bind( function( to ) { if ( 'blank' === to ) { @@ -41,9 +41,9 @@ value.bind( function( to ) { var body = $( 'body' ); - if ( ( '#ffffff' == to || '#fff' == to ) && 'none' == body.css( 'background-image' ) ) + if ( ( '#ffffff' === to || '#fff' === to ) && 'none' === body.css( 'background-image' ) ) body.addClass( 'custom-background-white' ); - else if ( '' == to && 'none' == body.css( 'background-image' ) ) + else if ( '' === to && 'none' === body.css( 'background-image' ) ) body.addClass( 'custom-background-empty' ); else body.removeClass( 'custom-background-empty custom-background-white' ); diff --git a/page-templates/front-page.php b/page-templates/front-page.php index 9ae4f27dd..28ce766b9 100644 --- a/page-templates/front-page.php +++ b/page-templates/front-page.php @@ -17,7 +17,10 @@ get_header(); ?>
- +
@@ -26,10 +29,10 @@ get_header(); ?> - +
- \ No newline at end of file + diff --git a/page-templates/full-width.php b/page-templates/full-width.php index b0ce333c2..370e76eaf 100644 --- a/page-templates/full-width.php +++ b/page-templates/full-width.php @@ -19,12 +19,15 @@ get_header(); ?>
- + - +
- \ No newline at end of file + diff --git a/page.php b/page.php index b06cd1f20..7107a61ce 100644 --- a/page.php +++ b/page.php @@ -17,13 +17,16 @@ get_header(); ?>
- + - +
- \ No newline at end of file + diff --git a/readme.txt b/readme.txt index 9e66e4dba..39fa6d285 100644 --- a/readme.txt +++ b/readme.txt @@ -1,8 +1,7 @@ === Twenty Twelve === -Contributors: the WordPress team -Requires at least: WordPress 3.5 -Tested up to: WordPress 4.9-trunk -Stable tag: 2.3 +Contributors: wordpressdotorg +Tested up to: 5.6 +Stable tag: 3.2 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 @@ -22,7 +21,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or == Copyright == -Twenty Twelve WordPress Theme, Copyright 2012-2017 WordPress.org & Automattic.com +Twenty Twelve WordPress Theme, Copyright 2012-2020 WordPress.org & Automattic.com Twenty Twelve is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify @@ -43,6 +42,51 @@ Source: https://github.com/aFarkas/html5shiv == Changelog == += 3.2 = +* Released: August 11, 2020 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.2 + += 3.1 = +* Released: March 31, 2020 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.1 + += 3.0 = +* Released: May 7, 2019 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.0 + += 2.9 = +* Released: February 21, 2019 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.9 + += 2.8 = +* Released: January 9, 2019 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.8 + += 2.7 = +* Released: December 19, 2018 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.7 + += 2.6 = +* Released: December 6, 2018 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.6 + += 2.5 = +* Released: May 17, 2018 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.5 + += 2.4 = +* Released: November 14, 2017 + +https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_2.4 + = 2.3 = * Released: June 8, 2017 diff --git a/rtl.css b/rtl.css index 45740f2d5..b3d6b0141 100644 --- a/rtl.css +++ b/rtl.css @@ -134,6 +134,9 @@ label ~ span.required { margin: -18px -16px 0 0; margin: -1.285714286rem -1.142857143rem 0 0; } +#respond #wp-comment-cookies-consent { + margin: 0 0 0 10px; +} /* =Front page template styling @@ -170,6 +173,7 @@ label ~ span.required { #wp-calendar caption { text-align: right; } +.wp-calendar-nav-next, #wp-calendar #next { padding-left: 24px; padding-left: 1.714285714rem; diff --git a/search.php b/search.php index 97a309b12..99acfe403 100644 --- a/search.php +++ b/search.php @@ -15,13 +15,21 @@ get_header(); ?> - - + @@ -46,4 +54,4 @@ get_header(); ?> - \ No newline at end of file + diff --git a/sidebar-front.php b/sidebar-front.php index 990a09fec..5f1193537 100644 --- a/sidebar-front.php +++ b/sidebar-front.php @@ -15,8 +15,9 @@ * * 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. ?> @@ -32,4 +33,4 @@ if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
- \ No newline at end of file + diff --git a/sidebar.php b/sidebar.php index a59dcc49b..ca9dbddb7 100644 --- a/sidebar.php +++ b/sidebar.php @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/single.php b/single.php index 38175246f..4cc6a43a4 100644 --- a/single.php +++ b/single.php @@ -12,7 +12,10 @@ get_header(); ?>
- + @@ -24,10 +27,10 @@ get_header(); ?> - +
- \ No newline at end of file + diff --git a/style.css b/style.css index f2e0bf240..d26c4c519 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,9 @@ Theme URI: https://wordpress.org/themes/twentytwelve/ Author: the WordPress team - edit GOLEM 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.3 +Version: 3.2 +Requires at least: 3.5 +Requires PHP: 5.2.4 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 @@ -256,7 +258,7 @@ article.post-password-required input[type=submit], 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); + background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6); border: 1px solid #d2d2d2; border-radius: 3px; box-shadow: 0 1px 2px rgba(64, 64, 64, 0.1); @@ -286,7 +288,7 @@ article.post-password-required input[type=submit]:hover { 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-image: linear-gradient(to bottom, #f9f9f9, #ebebeb); } .menu-toggle:active, .menu-toggle.toggled-on, @@ -301,7 +303,7 @@ input[type="reset"]:active { 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-image: linear-gradient(to bottom, #ebebeb, #e1e1e1); box-shadow: inset 0 0 8px 2px #c6c6c6, 0 1px 0 0 #f4f4f4; border-color: transparent; } @@ -701,6 +703,12 @@ footer[role="contentinfo"] a:hover { /* color: #21759b; GOLEM */ color: #009000; } +.site-info span[role=separator] { + padding: 0 0.3em 0 0.6em; +} +.site-info span[role=separator]::before { + content: '\002f'; +} /* =Main content and comment content @@ -1280,7 +1288,7 @@ article.format-quote .entry-content blockquote { background-image: -ms-linear-gradient(top, #009cee, #0088d0); background-image: -webkit-linear-gradient(top, #009cee, #0088d0); background-image: -o-linear-gradient(top, #009cee, #0088d0); - background-image: linear-gradient(top, #009cee, #0088d0); + background-image: linear-gradient(to bottom, #009cee, #0088d0); border-radius: 3px; border: 1px solid #007cbd; } @@ -1365,6 +1373,12 @@ a.comment-edit-link:hover { line-height: 2; color: #5e5e5e; } +#respond #wp-comment-cookies-consent { + margin: 0 10px 0 0; +} +#respond .comment-form-cookies-consent label { + display: inline; +} .required { color: red; } @@ -1415,6 +1429,9 @@ a.comment-edit-link:hover { /* =Widgets -------------------------------------------------------------- */ +.widget select { + max-width: 100%; + } .widget-area .widget ul ul { margin-left: 12px; margin-left: 0.857142857rem; @@ -1431,6 +1448,7 @@ a.comment-edit-link:hover { margin-left: 12px; margin-left: 0.857142857rem; } +.wp-calendar-nav, #wp-calendar { margin: 0; width: 100%; @@ -1444,6 +1462,13 @@ a.comment-edit-link:hover { #wp-calendar caption { text-align: left; } +.wp-calendar-nav { + display: table; +} +.wp-calendar-nav span { + display: table-cell; +} +.wp-calendar-nav-next, #wp-calendar #next { padding-right: 24px; padding-right: 1.714285714rem; @@ -1462,6 +1487,32 @@ a.comment-edit-link:hover { display: block; text-align: right; } +.tagcloud ul { + list-style-type: none; +} + +.tagcloud ul li { + display: inline-block; +} + +.widget-area .widget.widget_tag_cloud li { + line-height: 1; +} +.template-front-page .widget-area .widget.widget_tag_cloud li { + margin: 0; +} + +.widget-area .gallery-columns-2.gallery-size-full .gallery-icon img, +.widget-area .gallery-columns-3.gallery-size-full .gallery-icon img, +.widget-area .gallery-columns-4.gallery-size-full .gallery-icon img, +.widget-area .gallery-columns-5.gallery-size-full .gallery-icon img, +.widget-area .gallery-columns-6 .gallery-icon img, +.widget-area .gallery-columns-7 .gallery-icon img, +.widget-area .gallery-columns-8 .gallery-icon img, +.widget-area .gallery-columns-9 .gallery-icon img { + height: auto; + max-width: 80%; +} /* =Plugins ----------------------------------------------- */ diff --git a/tag.php b/tag.php index 1742df4ad..041427729 100644 --- a/tag.php +++ b/tag.php @@ -4,7 +4,7 @@ * * Used to display archive-type pages for posts in a tag. * - * @link https://codex.wordpress.org/Template_Hierarchy + * @link https://developer.wordpress.org/themes/basics/template-hierarchy/ * * @package WordPress * @subpackage Twenty_Twelve @@ -18,20 +18,26 @@ get_header(); ?>
-

' . single_tag_title( '', false ) . '' ); ?>

+

+ ' . single_tag_title( '', false ) . '' ); + ?> +

- +