Changeset 21975

Timestamp:

09/24/2012 04:57:42 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Twelve: remove twentytwelve_frontpage_sidebar_class() and make front page sidebar number filterable via body_class. Fixes #21942.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (3 diffs)
• rtl.css (modified) (2 diffs)
• sidebar-front.php (modified) (1 diff)
• style.css (modified) (3 diffs)

trunk/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' ) ) :
@@ -365 +351 @@
  * 1. Using a full-width layout, when no active widgets in the sidebar
  *    or full-width template.
- * 2. A thumbnail in the Front Page template.
+ * 2. Front Page template: thumbnail in use and number of sidebars for
+ *    widget areas.
  * 3. White or empty background color to change the layout and spacing.
+ * 4. Custom fonts enabled.
+ * 5. Single or multiple authors.
  *
  * @since Twenty Twelve 1.0
@@ -383 +372 @@
         if ( has_post_thumbnail() )
             $classes[] = 'has-post-thumbnail';
+        if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+            $classes[] = 'two-sidebars';
     }
 

trunk/wp-content/themes/twentytwelve/rtl.css

@@ -200 +200 @@
     }
     .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;
     }
@@ -207 +207 @@
     }
     .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;

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

@@ -21 +21 @@
 // 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">

trunk/wp-content/themes/twentytwelve/style.css

@@ -1475 +1475 @@
     }
     .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%;
@@ -1485 +1485 @@
     }
     .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%;
@@ -1491 +1491 @@
         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;