<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19915] trunk/wp-content/themes/twentytwelve: Twenty Twelve template changes and fixes ...</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19915">19915</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-02-14 03:54:46 +0000 (Tue, 14 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve template changes and fixes ... see <a href="http://core.trac.wordpress.org/ticket/19978">#19978</a>.
* Add custom header support
* header.php: use `get_stylesheet_uri()` to load stylesheet, props Mamaduka
* Add full-width template, including adding relevant body_class value as a CSS hook
* Hide sidebar on all views if no active widgets exist
* Fix site title output (was missing site title)
* Remove "featured" title for sticky posts
* Add content template files for aside, image, link, and quote post formats
* Indent content-single.php to match content.php
* Remove sample JPG since Twenty Twelve ships with no default header images
... and style updates, props drewstrojny
* Better footer styles
* Styling for full-width layouts
* Add basic styles for archive views
* Refine post header/footer styles a bit</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvearchivephp">trunk/wp-content/themes/twentytwelve/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecontentsinglephp">trunk/wp-content/themes/twentytwelve/content-single.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecontentphp">trunk/wp-content/themes/twentytwelve/content.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveheaderphp">trunk/wp-content/themes/twentytwelve/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveindexphp">trunk/wp-content/themes/twentytwelve/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesidebarphp">trunk/wp-content/themes/twentytwelve/sidebar.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvestylecss">trunk/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvecontentasidephp">trunk/wp-content/themes/twentytwelve/content-aside.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecontentimagephp">trunk/wp-content/themes/twentytwelve/content-image.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecontentlinkphp">trunk/wp-content/themes/twentytwelve/content-link.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvecontentquotephp">trunk/wp-content/themes/twentytwelve/content-quote.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvefullwidthpagephp">trunk/wp-content/themes/twentytwelve/full-width-page.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/wp-content/themes/twentytwelve/images/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvearchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/archive.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/archive.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/archive.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -18,36 +18,31 @@
</span><span class="cx"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><ins>+ <h1 class="archive-title all-caps-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() ) {
+ printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
+ } elseif ( is_tag() ) {
+ printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+ // Show an optional tag description
+ $tag_description = tag_description();
+ if ( $tag_description )
+ echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+ } elseif ( is_category() ) {
+ printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+ // Show an optional category description
+ $category_description = category_description();
+ if ( $category_description )
+ echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+ } else {
+ _e( 'Blog Archives', 'twentytwelve' );
+ }
+ ?></h1>
</ins><span class="cx">
</span><del>- <header class="page-header">
- <h1 class="page-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() ) {
- printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
- } elseif ( is_tag() ) {
- printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
- // Show an optional tag description
- $tag_description = tag_description();
- if ( $tag_description )
- echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
- } elseif ( is_category() ) {
- printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
- // Show an optional category description
- $category_description = category_description();
- if ( $category_description )
- echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
- } else {
- _e( 'Blog Archives', 'twentytwelve' );
- }
- ?></h1>
- </header>
-
</del><span class="cx"> <?php
</span><del>- twentytwelve_content_nav( 'nav-above' );
-
</del><span class="cx"> /* Start the Loop */
</span><span class="cx"> while ( have_posts() ) : the_post();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentasidephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentytwelve/content-aside.php (0 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content-aside.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/content-aside.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Aside post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <?php twentytwelve_posted_on(); ?>
+ <?php if ( comments_open() ) : ?>
+ <span class="sep"> | </span>
+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+ <?php endif; ?>
+ <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+ </footer><!-- #entry-meta -->
+ </article><!-- #post -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentimagephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentytwelve/content-image.php (0 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content-image.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/content-image.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Image post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+
+ <div class="entry-meta">
+ <?php twentytwelve_posted_on(); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+ if ( $categories_list ) :
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+ if ( $tags_list ) : ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
+
+ <?php if ( comments_open() ) : ?>
+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+ <?php endif; // End if comments_open() ?>
+
+ <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+ </footer><!-- #entry-meta -->
+ </article><!-- #post -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentlinkphp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentytwelve/content-link.php (0 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content-link.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/content-link.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Link post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <?php twentytwelve_posted_on(); ?>
+ <?php if ( comments_open() ) : ?>
+ <span class="sep"> | </span>
+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+ <?php endif; ?>
+ <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+ </footer><!-- #entry-meta -->
+ </article><!-- #post -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentquotephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentytwelve/content-quote.php (0 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content-quote.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/content-quote.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<?php
+/**
+ * The template for displaying posts in the Quote post format
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+
+ <div class="entry-meta">
+ <?php twentytwelve_posted_on(); ?>
+ </div><!-- .entry-meta -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+ if ( $categories_list ) :
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+ if ( $tags_list ) : ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
+
+ <?php if ( comments_open() ) : ?>
+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
+ <?php endif; // End if comments_open() ?>
+
+ <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+ </footer><!-- #entry-meta -->
+ </article><!-- #post -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/content-single.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content-single.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/content-single.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -8,64 +8,64 @@
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <header class="entry-header">
- <h1 class="entry-title"><?php the_title(); ?></h1>
</del><ins>+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><?php the_title(); ?></h1>
</ins><span class="cx">
</span><del>- <?php if ( 'post' == get_post_type() ) : ?>
- <div class="entry-meta">
- <?php twentytwelve_posted_on(); ?>
- </div><!-- .entry-meta -->
- <?php endif; ?>
- </header><!-- .entry-header -->
</del><ins>+ <?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
+ <div class="entry-meta">
+ <?php twentytwelve_posted_on(); ?>
+ </div><!-- .entry-meta -->
+ <?php endif; ?>
+ </header><!-- .entry-header -->
</ins><span class="cx">
</span><del>- <div class="entry-content">
- <?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
- </div><!-- .entry-content -->
</del><ins>+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+ </div><!-- .entry-content -->
</ins><span class="cx">
</span><del>- <footer class="entry-meta">
- <?php
- /* translators: used between list items, there is a space after the comma */
- $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
</del><ins>+ <footer class="entry-meta">
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
</ins><span class="cx">
</span><del>- /* translators: used between list items, there is a space after the comma */
- $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
- if ( '' != $tag_list ) {
- $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
- } elseif ( '' != $categories_list ) {
- $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
- } else {
- $utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
- }
</del><ins>+ /* translators: used between list items, there is a space after the comma */
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+ if ( '' != $tag_list ) {
+ $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+ } elseif ( '' != $categories_list ) {
+ $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+ } else {
+ $utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentytwelve' );
+ }
</ins><span class="cx">
</span><del>- printf(
- $utility_text,
- $categories_list,
- $tag_list,
- esc_url( get_permalink() ),
- the_title_attribute( 'echo=0' ),
- get_the_author(),
- esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
- );
- ?>
- <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins>+ printf(
+ $utility_text,
+ $categories_list,
+ $tag_list,
+ esc_url( get_permalink() ),
+ the_title_attribute( 'echo=0' ),
+ get_the_author(),
+ esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
+ );
+ ?>
+ <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx">
</span><del>- <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
- <div id="author-info">
- <div id="author-avatar">
- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
- </div><!-- #author-avatar -->
- <div id="author-description">
- <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
- <?php the_author_meta( 'description' ); ?>
- <div id="author-link">
- <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
- <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
- </a>
- </div><!-- #author-link -->
- </div><!-- #author-description -->
- </div><!-- #entry-author-info -->
- <?php endif; ?>
- </footer><!-- .entry-meta -->
-</article><!-- #post -->
</del><ins>+ <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
+ <div id="author-info">
+ <div id="author-avatar">
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
+ </div><!-- #author-avatar -->
+ <div id="author-description">
+ <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
+ <?php the_author_meta( 'description' ); ?>
+ <div id="author-link">
+ <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
+ <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
+ </a>
+ </div><!-- #author-link -->
+ </div><!-- #author-description -->
+ </div><!-- #entry-author-info -->
+ <?php endif; ?>
+ </footer><!-- .entry-meta -->
+ </article><!-- #post -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvecontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/content.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/content.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/content.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The default template for displaying content
</del><ins>+ * The default template for displaying content on indexed pages (home, archive, search)
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Twelve
</span><span class="lines">@@ -10,23 +10,16 @@
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <header class="entry-header">
</span><del>- <?php if ( is_sticky() ) : ?>
- <hgroup>
- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
- <h3 class="entry-format"><?php _e( 'Featured', 'twentytwelve' ); ?></h3>
- </hgroup>
- <?php else : ?>
</del><span class="cx"> <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php if ( 'post' == get_post_type() ) : ?>
</del><ins>+ <?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
</ins><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php twentytwelve_posted_on(); ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><del>- <?php if ( is_search() ) : // Only display Excerpts for Search ?>
</del><ins>+ <?php if ( is_search() ) : // Only display excerpts for search ?>
</ins><span class="cx"> <div class="entry-summary">
</span><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="lines">@@ -38,36 +31,27 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><del>- <?php $show_sep = false; ?>
- <?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
</del><ins>+ <?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages ?>
</ins><span class="cx"> <?php
</span><span class="cx"> /* translators: used between list items, there is a space after the comma */
</span><span class="cx"> $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
</span><del>- if ( $categories_list ):
</del><ins>+ if ( $categories_list ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <span class="cat-links">
</span><del>- <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
- $show_sep = true; ?>
</del><ins>+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
</ins><span class="cx"> </span>
</span><span class="cx"> <?php endif; // End if categories ?>
</span><span class="cx"> <?php
</span><span class="cx"> /* translators: used between list items, there is a space after the comma */
</span><span class="cx"> $tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
</span><del>- if ( $tags_list ):
- if ( $show_sep ) : ?>
- <span class="sep"> | </span>
- <?php endif; // End if $show_sep ?>
</del><ins>+ if ( $tags_list ) : ?>
</ins><span class="cx"> <span class="tag-links">
</span><del>- <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
- $show_sep = true; ?>
</del><ins>+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentytwelve' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
</ins><span class="cx"> </span>
</span><span class="cx"> <?php endif; // End if $tags_list ?>
</span><span class="cx"> <?php endif; // End if 'post' == get_post_type() ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><del>- <?php if ( $show_sep ) : ?>
- <span class="sep"> | </span>
- <?php endif; // End if $show_sep ?>
</del><span class="cx"> <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '<b>1</b> Reply', 'twentytwelve' ), __( '<b>%</b> Replies', 'twentytwelve' ) ); ?></span>
</span><span class="cx"> <?php endif; // End if comments_open() ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefullwidthpagephp"></a>
<div class="addfile"><h4>Added: trunk/wp-content/themes/twentytwelve/full-width-page.php (0 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/full-width-page.php (rev 0)
+++ trunk/wp-content/themes/twentytwelve/full-width-page.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?php
+/**
+ * Template Name: Full-width page, no sidebar
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+
+get_header(); ?>
+
+ <div id="primary">
+ <div id="content" role="main">
+
+ <?php while ( have_posts() ) : the_post(); ?>
+ <?php get_template_part( 'content', 'page' ); ?>
+ <?php comments_template( '', true ); ?>
+ <?php endwhile; // end of the loop. ?>
+
+ </div><!-- #content -->
+ </div><!-- #primary -->
+
+<?php get_footer(); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> */
</span><span class="cx"> add_action( 'after_setup_theme', 'twentytwelve_setup' );
</span><span class="cx">
</span><del>-if ( ! function_exists( 'twentytwelve_setup' ) ):
</del><ins>+if ( ! function_exists( 'twentytwelve_setup' ) ) :
</ins><span class="cx"> /**
</span><span class="cx"> * Sets up theme defaults and registers support for various WordPress features.
</span><span class="cx"> *
</span><span class="lines">@@ -59,15 +59,135 @@
</span><span class="cx"> // Add default posts and comments RSS feed links to <head>.
</span><span class="cx"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx">
</span><ins>+ // Add support for a variety of post formats
+ add_theme_support( 'post-formats', array( 'aside', 'image', 'link', 'quote' ) );
+
</ins><span class="cx"> // This theme uses wp_nav_menu() in one location.
</span><span class="cx"> register_nav_menu( 'primary', __( 'Primary Menu', 'twentytwelve' ) );
</span><span class="cx">
</span><del>- // Add support for custom backgrounds
</del><ins>+ // Add support for custom background.
</ins><span class="cx"> add_custom_background();
</span><ins>+
+ // Add support for a custom header image.
+ $header_args = array(
+ 'random-default' => true,
+ 'flex-height' => true,
+ 'suggested-height' => apply_filters( 'twentytwelve_header_image_height', 250 ),
+ 'flex-width' => true,
+ 'max-width' => apply_filters( 'twentytwelve_header_image_max_width', 2000 ),
+ 'suggested-width' => apply_filters( 'twentytwelve_header_image_width', 960 ),
+ );
+ add_theme_support( 'custom-header', $header_args );
+ add_custom_image_header( 'twentytwelve_header_style', 'twentytwelve_admin_header_style', 'twentytwelve_admin_header_image' );
+
+ // The default header text color
+ define( 'HEADER_TEXTCOLOR', '444' );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><ins>+if ( ! function_exists( 'twentytwelve_header_style' ) ) :
</ins><span class="cx"> /**
</span><ins>+ * Styles the header image and text displayed on the blog
+ *
+ * get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank'), or any hex value
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_header_style() {
+ // If no custom options for text are set, let's bail
+ if ( HEADER_TEXTCOLOR == get_header_textcolor() )
+ return;
+ // If we get this far, we have custom styles.
+ ?>
+ <style type="text/css">
+ <?php
+ // Has the text been hidden?
+ if ( 'blank' == get_header_textcolor() ) :
+ ?>
+ .site-title,
+ .site-description {
+ position: absolute !important;
+ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+ clip: rect(1px, 1px, 1px, 1px);
+ }
+ <?php
+ // If the user has set a custom color for the text, use that.
+ else :
+ ?>
+ .site-title a,
+ .site-description {
+ color: #<?php echo get_header_textcolor(); ?> !important;
+ }
+ <?php endif; ?>
+ </style>
+ <?php
+}
+endif;
+
+if ( ! function_exists( 'twentytwelve_admin_header_style' ) ) :
+/**
+ * Styles the header image displayed on the Appearance > Header admin panel.
+ *
+ * Referenced via add_custom_image_header() in twentytwelve_setup().
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_admin_header_style() {
+?>
+ <style type="text/css">
+ .appearance_page_custom-header #headimg {
+ border: none;
+ }
+ #headimg h1,
+ #headimg h2 {
+ line-height: 1.6;
+ margin: 0;
+ padding: 0;
+ }
+ #headimg h1 {
+ font-size: 30px;
+ }
+ #headimg h1 a {
+ text-decoration: none;
+ }
+ #headimg h2 {
+ font: normal 13px/1.8 "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
+ margin-bottom: 24px;
+ }
+ #headimg img {
+ }
+ </style>
+<?php
+}
+endif;
+
+if ( ! function_exists( 'twentytwelve_admin_header_image' ) ) :
+/**
+ * Custom header image markup displayed on the Appearance > Header admin panel.
+ *
+ * Referenced via add_custom_image_header() in twentytwelve_setup().
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_admin_header_image() { ?>
+ <div id="headimg">
+ <?php
+ if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) )
+ $style = ' style="display:none;"';
+ else
+ $style = ' style="color:#' . get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) . ';"';
+ ?>
+ <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
+ <h2 id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></h2>
+ <?php $header_image = get_header_image();
+ if ( ! empty( $header_image ) ) : ?>
+ <img src="<?php echo esc_url( $header_image ); ?>" alt="" />
+ <?php endif; ?>
+ </div>
+<?php }
+endif;
+
+/**
</ins><span class="cx"> * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="lines">@@ -89,7 +209,7 @@
</span><span class="cx"> 'id' => 'sidebar-1',
</span><span class="cx"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx"> 'after_widget' => "</aside>",
</span><del>- 'before_title' => '<h3 class="widget-title">',
</del><ins>+ 'before_title' => '<h3 class="widget-title all-caps-title">',
</ins><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="lines">@@ -107,8 +227,8 @@
</span><span class="cx"> if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx"> <nav id="<?php echo $nav_id; ?>">
</span><span class="cx"> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
</span><del>- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
</del><ins>+ <div class="nav-previous alignleft"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
+ <div class="nav-next alignright"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
</ins><span class="cx"> </nav><!-- #nav-above -->
</span><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><span class="lines">@@ -201,4 +321,19 @@
</span><span class="cx"> get_the_author()
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-endif;
</del><span class="cx">\ No newline at end of file
</span><ins>+endif;
+
+/**
+ * Extends the default WordPress body class to denote a full-width layout.
+ *
+ * Used in two cases: no active widgets in sidebar, and full-width page template.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_body_class( $classes ) {
+ if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'full-width' ) )
+ $classes[] = 'full-width';
+
+ return $classes;
+}
+add_filter( 'body_class', 'twentytwelve_body_class' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/header.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/header.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/header.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><span class="cx"> <meta name="viewport" content="width=device-width" />
</span><del>-<title><?php wp_title( '|', true, 'right' ); ?></title>
</del><ins>+<title><?php wp_title( '|', true, 'right' ); ?> <?php bloginfo( 'name' ); ?></title>
</ins><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><span class="cx">
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> if ( is_singular() && get_option( 'thread_comments' ) )
</span><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span><span class="cx">
</span><del>-wp_enqueue_style( 'twentytwelve-style', get_bloginfo( 'stylesheet_url' ) );
</del><ins>+wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
</ins><span class="cx"> ?>
</span><span class="cx"> <?php wp_head(); ?>
</span><span class="cx"> </head>
</span><span class="lines">@@ -46,6 +46,11 @@
</span><span class="cx"> <div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'twentytwelve' ); ?>"><?php _e( 'Skip to secondary content', 'twentytwelve' ); ?></a></div>
</span><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </nav>
</span><ins>+
+ <?php $header_image = get_header_image();
+ if ( ! empty( $header_image ) ) : ?>
+ <img src="<?php echo esc_url( $header_image ); ?>" alt="" />
+ <?php endif; ?>
</ins><span class="cx"> </header><!-- #masthead -->
</span><span class="cx">
</span><span class="cx"> <div id="main">
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/index.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/index.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/index.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -16,11 +16,6 @@
</span><span class="cx">
</span><span class="cx"> <div id="primary">
</span><span class="cx"> <div id="content" role="main">
</span><del>- <!-- Placeholder for optional header image
- <section role="banner">
- <img src="<?php echo get_stylesheet_directory_uri(); ?>/images/flowers.jpg" width="625" height="188" />
- </section>
- -->
</del><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/sidebar.php (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/sidebar.php 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/sidebar.php 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -2,29 +2,16 @@
</span><span class="cx"> /**
</span><span class="cx"> * The Sidebar containing the main widget area.
</span><span class="cx"> *
</span><ins>+ * If no active widgets in sidebar, hide it completely.
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Twelve
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><del>- <div id="secondary" class="widget-area" role="complementary">
- <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
</del><span class="cx">
</span><del>- <aside id="archives" class="widget">
- <h3 class="widget-title"><?php _e( 'Archives', 'twentytwelve' ); ?></h3>
- <ul>
- <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
- </ul>
- </aside>
-
- <aside id="meta" class="widget">
- <h3 class="widget-title"><?php _e( 'Meta', 'twentytwelve' ); ?></h3>
- <ul>
- <?php wp_register(); ?>
- <li><?php wp_loginout(); ?></li>
- <?php wp_meta(); ?>
- </ul>
- </aside>
-
- <?php endif; // end sidebar widget area ?>
- </div><!-- #secondary .widget-area -->
</del><span class="cx">\ No newline at end of file
</span><ins>+ <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
+ <div id="secondary" class="widget-area" role="complementary">
+ <?php dynamic_sidebar( 'sidebar-1' ); ?>
+ </div><!-- #secondary .widget-area -->
+ <?php endif; ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (19914 => 19915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-02-13 21:01:55 UTC (rev 19914)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-02-14 03:54:46 UTC (rev 19915)
</span><span class="lines">@@ -114,6 +114,17 @@
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* patterns.scss
+ * Repeatable patterns
+ * ------------------------------------------------------------------ */
+.all-caps-title {
+ text-transform: uppercase;
+ font-weight: 400;
+ font-size: 13px;
+ font-size: 0.928571429rem;
+ line-height: 1.846153846;
+}
+
</ins><span class="cx"> /* scaffolding.css.scss
</span><span class="cx"> * Basic structure
</span><span class="cx"> * ------------------------------------------------------------------ */
</span><span class="lines">@@ -148,46 +159,50 @@
</span><span class="cx"> /*---------------------------------------------------------
</span><span class="cx"> Page structure
</span><span class="cx"> ------------------------------------------------------------ */
</span><del>-div#page {
</del><ins>+#page {
</ins><span class="cx"> padding: 0 24px;
</span><span class="cx"> padding: 0 1.714285714rem;
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> }
</span><span class="cx"> @media screen and (min-width: 600px) {
</span><del>- div#page {
</del><ins>+ #page {
</ins><span class="cx"> zoom: 1;
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> max-width: 960px;
</span><span class="cx"> max-width: 68.571428571rem;
</span><span class="cx"> }
</span><del>- div#page:before, div#page:after {
</del><ins>+ #page:before, #page:after {
</ins><span class="cx"> display: table;
</span><span class="cx"> content: "";
</span><span class="cx"> }
</span><del>- div#page:after {
</del><ins>+ #page:after {
</ins><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-div#primary {
</del><ins>+#primary {
</ins><span class="cx"> margin: 24px 0;
</span><span class="cx"> margin: 1.714285714rem 0;
</span><span class="cx"> }
</span><span class="cx"> @media screen and (min-width: 600px) {
</span><del>- div#primary {
</del><ins>+ #primary {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 65.104166667%;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@media screen and (min-width: 600px) {
+ body.full-width #primary {
+ width: 100%;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div#secondary {
</del><ins>+#secondary {
</ins><span class="cx"> margin: 24px 0;
</span><span class="cx"> margin: 1.714285714rem 0;
</span><span class="cx"> }
</span><span class="cx"> @media screen and (min-width: 600px) {
</span><del>- div#secondary {
</del><ins>+ #secondary {
</ins><span class="cx"> float: right;
</span><span class="cx"> width: 26.041666667%;
</span><span class="cx"> }
</span><span class="lines">@@ -347,11 +362,6 @@
</span><span class="cx"> div#secondary aside h3 {
</span><span class="cx"> margin-bottom: 24px;
</span><span class="cx"> margin-bottom: 1.714285714rem;
</span><del>- text-transform: uppercase;
- font-weight: 300;
- font-size: 13px;
- font-size: 0.928571429rem;
- line-height: 1.846153846;
</del><span class="cx"> }
</span><span class="cx"> div#secondary aside p,
</span><span class="cx"> div#secondary aside li {
</span><span class="lines">@@ -520,4 +530,16 @@
</span><span class="cx"> object,
</span><span class="cx"> video {
</span><span class="cx"> max-width: 100%;
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
+
+/* archive.css.scss
+ * Styling for the archive view
+ * ------------------------------------------------------------------ */
+#content.archive h1.archive-title {
+ margin-bottom: 48px;
+ margin-bottom: 3.428571429rem;
+ padding-bottom: 22px;
+ padding-bottom: 1.571428571rem;
+ border-bottom: 1px solid #ededed;
+ color: #777777;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>