Ticket #21942: 21942.diff

wp-content/themes/twentytwelve/style.css

@@ -1474 +1474 @@
                 width: 47.916666667%;
         }
         .template-front-page .widget-area .widget,
-        .template-front-page .widget-area.two .front-widgets {
+        .template-front-page.two-sidebars .widget-area .front-widgets {
                 float: left;
                 width: 51.875%;
                 margin-bottom: 24px;
@@ -1484 +1484 @@
                 clear: right;
         }
         .template-front-page .widget-area .widget:nth-child(even),
-        .template-front-page .widget-area.two .front-widgets + .front-widgets {
+        .template-front-page.two-sidebars .widget-area .front-widgets + .front-widgets {
                 float: right;
                 width: 39.0625%;
                 margin: 0 0 24px;
                 margin: 0 0 1.714285714rem;
         }
-        .template-front-page .widget-area.two .widget,
-        .template-front-page .widget-area.two .widget:nth-child(even) {
+        .template-front-page.two-sidebars .widget,
+        .template-front-page.two-sidebars .widget:nth-child(even) {
                 float: none;
                 width: auto;
         }

wp-content/themes/twentytwelve/sidebar-front.php

@@ -20 +20 @@
 
 // If we get this far, we have widgets. Let do this.
 ?>
-<div id="secondary" <?php twentytwelve_frontpage_sidebar_class(); ?> role="complementary">
+<div id="secondary" class="widget-area" role="complementary">
         <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
         <div class="first front-widgets">
                 <?php dynamic_sidebar( 'sidebar-2' ); ?>

wp-content/themes/twentytwelve/rtl.css

@@ -199 +199 @@
                 margin: 8px 0 8px 24px;
         }
         .template-front-page .widget-area .widget,
-        .template-front-page .widget-area.two .front-widgets {
+        .template-front-page.two-sidebars .widget-area .front-widgets {
                 float: right;
         }
         .template-front-page .widget-area .widget:nth-child(odd) {
                 clear: left;
         }
         .template-front-page .widget-area .widget:nth-child(even),
-        .template-front-page .widget-area.two .front-widgets + .front-widgets {
+        .template-front-page.two-sidebars .widget-area .front-widgets + .front-widgets {
                 float: left;
                 margin: 0 24px 0;
                 margin: 0 1.714285714rem 0;

wp-content/themes/twentytwelve/functions.php

@@ -216 +216 @@
 }
 add_action( 'widgets_init', 'twentytwelve_widgets_init' );
 
-/**
- * Counts the number of footer sidebars to enable dynamic classes for the footer.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_frontpage_sidebar_class() {
-        $classes = array( 'widget-area' );
-
-        if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
-                $classes[] = 'two';
-
-        echo 'class="' . implode( ' ', $classes ) . '"';
-}
-
 if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
 /**
  * Displays navigation to next/previous pages when applicable.
@@ -366 +352 @@
  *    or full-width template.
  * 2. A thumbnail in the Front Page template.
  * 3. White or empty background color to change the layout and spacing.
+ * 4. Number of sidebars for front page template footer widget areas.
  *
  * @since Twenty Twelve 1.0
  *
@@ -378 +365 @@
         if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
                 $classes[] = 'full-width';
 
+        if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+                $classes[] = 'two-sidebars';
+
         if ( is_page_template( 'page-templates/front-page.php' ) ) {
                 $classes[] = 'template-front-page';
                 if ( has_post_thumbnail() )