Ticket #25031: 25031.2.diff

single.php

@@ -9 +9 @@
 get_header(); ?>
 
 <div id="primary" class="content-area">
-        <div id="content" class="site-content" role="main">
+        <div id="content" class="site-content <?php if ( !is_active_sidebar('sidebar-2') && is_single() ) { echo 'full-width page'; } ?>" role="main">
 
         <?php while ( have_posts() ) : the_post(); ?>
 
@@ -28 +28 @@
         </div><!-- #content .site-content -->
 </div><!-- #primary .content-area -->
 
-<?php get_sidebar( 'content' ); ?>
-
+<!-- check if content sidebar is active, call if it is; else stretch content-->
+        <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+                        <?php get_sidebar( 'content' ); ?>
+                <?php endif; ?>
+                
 <?php get_sidebar(); ?>
 
 <?php get_footer(); ?>
+ No newline at end of file

style.css

@@ -524 +524 @@
         position: relative;
 }
 #main {
-        max-width: 1230px;
-        max-width: 123.0rem;
+        max-width: 1260px;
+        max-width: 126.0rem;
 }
 #primary {
         padding-top:24px;
@@ -957 +957 @@
         margin-bottom: 2.4rem;
         max-width: 672px;
         max-width: 67.2rem;
+        margin-right:0;
 }
 .attachment-featured-thumbnail {
         background: #8c8c8c url(images/pattern.png) repeat 0 0;
@@ -1597 +1598 @@
         height: auto;
         max-width: 100%;
         vertical-align: middle;
+        width: 100%;
 }
 img.alignleft,
 .wp-caption.alignleft {
@@ -2793 +2795 @@
         .site-content {
                 margin: 0 33.33333333% 0 0;
         }
+        .full-width .entry-content {
+                margin:0 auto;
+        }
         #content-sidebar {
                 float: right;
                 margin: 0 0 0 -30.35714285%;
@@ -2861 +2866 @@
                 margin: 0 6.04307432%;
                 padding: 0 0 12px;
                 padding: 0 0 1.2rem;
+                margin-top: 1em;
         }
         #primary .full-width .entry-content {
                 margin: 0 6.04307432%;
@@ -2990 +2996 @@
         .error404 #primary .entry-header {
                 margin: 0 8.03571428% 0 12.5%;
         }
-        #primary .full-width .entry-header,
-        #primary .full-width .entry-content,
+        #primary .full-width .entry-content { margin: 0 6.04307432%; }
+        #primary .full-width .entry-header { margin-top:1em; }
         #primary .full-width footer.entry-meta {
                 margin: 0 11.30926724%;
         }
@@ -3002 +3008 @@
         #content-sidebar {
                 padding-top: 72px;
                 padding-top: 7.2rem;
+                float:right;
+                width: 25%;
         }
         #featured-content .hentry {
                 width: 33.3333333%;
@@ -3085 +3093 @@
                 padding-left: 22.2rem;
         }
         .site-content {
-                margin: 0 27.31707317% 0 222px;
-                margin: 0 27.31707317% 0 22.2rem;
+                margin: 0 0% 0 222px;
+                margin: 0 0 0 22.2rem;
+                float:left;
+                max-width: 126.0rem;
+                width: auto;
         }
         #secondary {
                 background-color: transparent;
@@ -3110 +3121 @@
         .front-page-content-wrapper {
                 float: left;
         }
-        .site-content {
-                margin: 0 27.31707317% 0 222px;
-                margin: 0 27.31707317% 0 22.2rem;
-        }
         #content-sidebar,
         .post-formatted-posts {
                 margin: 0 0 0 -27.31707317%;
@@ -3198 +3205 @@
                 padding: 0 0 12px;
                 padding: 0 0 1.2rem;
         }
-        #primary .full-width .entry-header,
-        #primary .full-width .entry-content,
+        #primary .full-width .entry-content { margin: 0 6.04307432%; }
+        #primary .full-width .entry-header { margin-top:1em; }
         #primary .full-width footer.entry-meta {
                 margin: 0 5.882236%;
         }
@@ -3324 +3331 @@
         .error404 #primary .entry-header {
                 margin: 0 8.03571428% 0 12.5%;
         }
-        #primary .full-width .entry-header,
-        #primary .full-width .entry-content,
+        #primary .full-width .entry-content { }
+        #primary .full-width .entry-header { margin-top:1em; }
         #primary .full-width footer.entry-meta {
                 margin: 0 11.21868265%;
         }
@@ -3363 +3370 @@
         .post-formatted-posts {
                 padding-right: 0;
         }
-        #primary .full-width .entry-header,
-        #primary .full-width .entry-content,
+        #primary .full-width .entry-content { }
+        #primary .full-width .entry-header { margin-top:1em; }
         #primary .full-width footer.entry-meta {
                 margin: 0 0 0 11.21868265%;
         }