<!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>[39078] trunk/src/wp-content/themes/twentyseventeen: Twenty Seventeen: Update page layout setting for all use cases</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39078">39078</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39078","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>davidakennedy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-01 20:39:54 +0000 (Tue, 01 Nov 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Seventeen: Update page layout setting for all use cases
* Makes sure the page layout setting also applies to pages, and is not completely hidden from them when a sidebar widget is present. Pages do not have a sidebar, so that was incorrect.
* Updates description in Customizer for brevity and accuracy.
* Applies setting to archive pages as well.
* Updates CSS to reflect changes.
Props celloexpressions, laurelfulford.
Fixes <a href="https://core.trac.wordpress.org/ticket/38538">#38538</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomizerphp">trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninctemplatefunctionsphp">trunk/src/wp-content/themes/twentyseventeen/inc/template-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenrtlcss">trunk/src/wp-content/themes/twentyseventeen/rtl.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenstylecss">trunk/src/wp-content/themes/twentyseventeen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyseventeeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2016-11-01 20:33:21 UTC (rev 39077)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2016-11-01 20:39:54 UTC (rev 39078)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,12 +79,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Page Layout', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'theme_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'radio',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'When no sidebar widgets are assigned, you can opt to display all pages with a one column or two column layout. When the two column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'When the two column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'choices' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'one-column' => __( 'One Column', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'two-column' => __( 'Two Column', 'twentyseventeen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'active_callback' => 'twentyseventeen_is_page_without_sidebar',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'active_callback' => 'twentyseventeen_is_view_with_layout_option',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,10 +184,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Return whether we're previewing a page and there are no widgets in the sidebar.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Return whether we're on a view that supports a one or two column layout.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function twentyseventeen_is_page_without_sidebar() {
- return ( is_page() && ! is_active_sidebar( 'sidebar-1' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function twentyseventeen_is_view_with_layout_option() {
+ // This option is available on all pages. It's also available on archives when there isn't a sidebar.
+ return ( is_page() || ( is_archive() && ! is_active_sidebar( 'sidebar-1' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninctemplatefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/template-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/template-functions.php 2016-11-01 20:33:21 UTC (rev 39077)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/template-functions.php 2016-11-01 20:39:54 UTC (rev 39078)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add class for one or two column page layouts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_page() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_page() || is_archive() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'one-column' === get_theme_mod( 'page_layout' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'page-one-column';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/rtl.css 2016-11-01 20:33:21 UTC (rev 39077)
+++ trunk/src/wp-content/themes/twentyseventeen/rtl.css 2016-11-01 20:39:54 UTC (rev 39078)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,18 +381,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> right: -2.5em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body:not(.has-sidebar) .page-header,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body:not(.has-sidebar):not(.page-one-column) .page-header,
</ins><span class="cx" style="display: block; padding: 0 10px"> body.has-sidebar.error404 #primary .page-header,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.page-two-column #primary .entry-header {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.page-two-column:not(.archive) #primary .entry-header,
+ body.page-two-column.archive:not(.has-sidebar) #primary .page-header {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .blog:not(.has-sidebar) #primary article,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .archive:not(.has-sidebar) #primary article,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .archive:not(.has-sidebar):not(.page-one-column) #primary article,
</ins><span class="cx" style="display: block; padding: 0 10px"> .search:not(.has-sidebar) #primary article,
</span><span class="cx" style="display: block; padding: 0 10px"> .has-sidebar.error404 #primary .page-content,
</span><span class="cx" style="display: block; padding: 0 10px"> .error404.has-sidebar #primary .page-content,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.page-two-column #primary .entry-content,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.page-two-column:not(.archive) #primary .entry-content,
</ins><span class="cx" style="display: block; padding: 0 10px"> body.page-two-column #comments {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +452,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .has-sidebar .navigation.pagination {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .has-sidebar .navigation.pagination,
+ .archive.page-one-column:not(.has-sidebar) .navigation.pagination {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/style.css 2016-11-01 20:33:21 UTC (rev 39077)
+++ trunk/src/wp-content/themes/twentyseventeen/style.css 2016-11-01 20:39:54 UTC (rev 39078)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2023,7 +2023,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Single Post */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .single-post:not(.has-sidebar) #primary,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.page.page-one-column:not(.twentyseventeen-front-page) #primary {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.page.page-one-column:not(.twentyseventeen-front-page) #primary,
+.archive.page-one-column:not(.has-sidebar) .page-header,
+.archive.page-one-column:not(.has-sidebar) #primary {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-left: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 740px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3664,19 +3666,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 32px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body:not(.has-sidebar) .page-header,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body:not(.has-sidebar):not(.page-one-column) .page-header,
</ins><span class="cx" style="display: block; padding: 0 10px"> body.has-sidebar.error404 #primary .page-header,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.page-two-column #primary .entry-header {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.page-two-column:not(.archive) #primary .entry-header,
+ body.page-two-column.archive:not(.has-sidebar) #primary .page-header {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 36%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .blog:not(.has-sidebar) #primary article,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .archive:not(.has-sidebar) #primary article,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .archive:not(.page-one-column):not(.has-sidebar) #primary article,
</ins><span class="cx" style="display: block; padding: 0 10px"> .search:not(.has-sidebar) #primary article,
</span><span class="cx" style="display: block; padding: 0 10px"> .error404:not(.has-sidebar) #primary .page-content,
</span><span class="cx" style="display: block; padding: 0 10px"> .error404.has-sidebar #primary .page-content,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.page-two-column #primary .entry-content,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.page-two-column:not(.archive) #primary .entry-content,
</ins><span class="cx" style="display: block; padding: 0 10px"> body.page-two-column #comments {
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 58%;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3694,7 +3697,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 58%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .has-sidebar .navigation.pagination {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .has-sidebar .navigation.pagination,
+ .archive.page-one-column:not(.has-sidebar) .navigation.pagination {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3778,7 +3782,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Pages */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-one-column .entry-header {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page.page-one-column .entry-header,
+ .twentyseventeen-front-page.page-one-column .entry-header,
+ .archive.page-one-column:not(.has-sidebar) .page-header {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 4em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>