Changeset 39078

Timestamp:

11/01/2016 08:39:54 PM (8 years ago)

Author:

davidakennedy

Message:

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 #38538.

Location:

trunk/src/wp-content/themes/twentyseventeen

Files:

• inc/customizer.php (modified) (2 diffs)
• inc/template-functions.php (modified) (1 diff)
• rtl.css (modified) (2 diffs)
• style.css (modified) (5 diffs)

trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php

@@ -80 +80 @@
         'section'     => 'theme_options',
         'type'        => 'radio',
-        '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' ),
+        'description' => __( 'When the two column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ),
         'choices'     => array(
             'one-column' => __( 'One Column', 'twentyseventeen' ),
             'two-column' => __( 'Two Column', 'twentyseventeen' ),
         ),
-        'active_callback' => 'twentyseventeen_is_page_without_sidebar',
+        'active_callback' => 'twentyseventeen_is_view_with_layout_option',
     ) );
 
@@ -185 +185 @@
 
 /**
- * Return whether we're previewing a page and there are no widgets in the sidebar.
- */
-function twentyseventeen_is_page_without_sidebar() {
-    return ( is_page() && ! is_active_sidebar( 'sidebar-1' ) );
+ * Return whether we're on a view that supports a one or two column layout.
+ */
+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' ) ) );
 }
 

trunk/src/wp-content/themes/twentyseventeen/inc/template-functions.php

@@ -46 +46 @@
 
     // Add class for one or two column page layouts.
-    if ( is_page() ) {
+    if ( is_page() || is_archive() ) {
         if ( 'one-column' === get_theme_mod( 'page_layout' ) ) {
             $classes[] = 'page-one-column';

trunk/src/wp-content/themes/twentyseventeen/rtl.css

@@ -382 +382 @@
     }
 
-    body:not(.has-sidebar) .page-header,
+    body:not(.has-sidebar):not(.page-one-column) .page-header,
     body.has-sidebar.error404 #primary .page-header,
-    body.page-two-column #primary .entry-header {
+    body.page-two-column:not(.archive) #primary .entry-header,
+    body.page-two-column.archive:not(.has-sidebar) #primary .page-header {
         float: right;
     }
 
     .blog:not(.has-sidebar) #primary article,
-    .archive:not(.has-sidebar) #primary article,
+    .archive:not(.has-sidebar):not(.page-one-column) #primary article,
     .search:not(.has-sidebar) #primary article,
     .has-sidebar.error404 #primary .page-content,
     .error404.has-sidebar #primary .page-content,
-    body.page-two-column #primary .entry-content,
+    body.page-two-column:not(.archive) #primary .entry-content,
     body.page-two-column #comments {
         float: left;
@@ -452 +453 @@
     }
 
-    .has-sidebar .navigation.pagination {
+    .has-sidebar .navigation.pagination,
+    .archive.page-one-column:not(.has-sidebar) .navigation.pagination {
         float: none;
     }

trunk/src/wp-content/themes/twentyseventeen/style.css

@@ -2024 +2024 @@
 
 .single-post:not(.has-sidebar) #primary,
-.page.page-one-column:not(.twentyseventeen-front-page) #primary {
+.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 {
     margin-left: auto;
     margin-right: auto;
@@ -3665 +3667 @@
     }
 
-    body:not(.has-sidebar) .page-header,
+    body:not(.has-sidebar):not(.page-one-column) .page-header,
     body.has-sidebar.error404 #primary .page-header,
-    body.page-two-column #primary .entry-header {
+    body.page-two-column:not(.archive) #primary .entry-header,
+    body.page-two-column.archive:not(.has-sidebar) #primary .page-header {
         float: left;
         width: 36%;
@@ -3673 +3676 @@
 
     .blog:not(.has-sidebar) #primary article,
-    .archive:not(.has-sidebar) #primary article,
+    .archive:not(.page-one-column):not(.has-sidebar) #primary article,
     .search:not(.has-sidebar) #primary article,
     .error404:not(.has-sidebar) #primary .page-content,
     .error404.has-sidebar #primary .page-content,
-    body.page-two-column #primary .entry-content,
+    body.page-two-column:not(.archive) #primary .entry-content,
     body.page-two-column #comments {
         float: right;
@@ -3695 +3698 @@
     }
 
-    .has-sidebar .navigation.pagination {
+    .has-sidebar .navigation.pagination,
+    .archive.page-one-column:not(.has-sidebar) .navigation.pagination {
         float: none;
         width: 100%;
@@ -3779 +3783 @@
     /* Pages */
 
-    .page-one-column .entry-header {
+    .page.page-one-column .entry-header,
+    .twentyseventeen-front-page.page-one-column .entry-header,
+    .archive.page-one-column:not(.has-sidebar) .page-header {
         margin-bottom: 4em;
     }