Changeset 14145

Timestamp:

10/25/2024 02:05:46 AM (19 months ago)

Author:

adamwood

Message:

Breathe 2024: Fix issues with heading hierarchy

See ​https://github.com/WordPress/wordpress.org/issues/389
See ​https://github.com/WordPress/wordpress.org/issues/382

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024

Files:

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

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/functions.php

@@ -637 +637 @@
 }
 add_filter( 'render_block_core/search', __NAMESPACE__ . '\modify_handbook_search_block_action', 10, 2 );
+
+/**
+ * Display navigation to next/previous pages when applicable
+ * Customized to fix issues with heading hierarchy.
+ */
+function breathe_content_nav( $nav_id ) {
+    global $wp_query, $post;
+
+    // Don't print empty markup on single pages if there's nowhere to navigate.
+    if ( is_single() ) {
+        $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
+        $next = get_adjacent_post( false, '', false );
+
+        if ( ! $next && ! $previous )
+            return;
+    }
+
+    // Don't print empty markup in archives if there's only one page.
+    if ( $wp_query->max_num_pages < 2 && ( is_home() || is_archive() || is_search() ) )
+        return;
+
+    $nav_class = ( is_single() ) ? 'navigation-post' : 'navigation-paging';
+
+    ?>
+    <nav role="navigation" id="<?php echo esc_attr( $nav_id ); ?>" class="<?php echo $nav_class; ?>">
+        <h2 class="screen-reader-text"><?php _e( 'Post navigation', 'p2-breathe' ); ?></h2>
+
+    <?php if ( is_single() ) : // navigation links for single posts ?>
+
+        <?php previous_post_link( '<div class="nav-previous">%link</div>', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'p2-breathe' ) . '</span> %title' ); ?>
+        <?php next_post_link( '<div class="nav-next">%link</div>', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'p2-breathe' ) . '</span>' ); ?>
+
+    <?php elseif ( $wp_query->max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?>
+
+        <?php if ( get_next_posts_link() ) : ?>
+        <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'p2-breathe' ) ); ?></div>
+        <?php endif; ?>
+
+        <?php if ( get_previous_posts_link() ) : ?>
+        <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'p2-breathe' ) ); ?></div>
+        <?php endif; ?>
+
+    <?php endif; ?>
+
+    </nav><!-- #<?php echo esc_html( $nav_id ); ?> -->
+    <?php
+}

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/sidebar.php

@@ -11 +11 @@
     <div id="primary-modal"></div>
     <div id="secondary" class="widget-area" role="complementary">
+        <h2 class="screen-reader-text"><?php esc_html_e( 'Site resources', 'wporg' ); ?></h2>
         <a href="#" id="secondary-toggle"><button aria-label="Close menu" class="wp-block-navigation__responsive-container-close"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button></a>
         <div id="secondary-content">

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/single-handbook.php

@@ -9 +9 @@
 
 <?php $is_landing_page = wporg_is_handbook_landing_page(); ?>
-
-<?php get_sidebar( 'handbook' ); ?>
 
 <?php if ( 'handbook' !== wporg_get_current_handbook() ) { ?>
@@ -57 +55 @@
 </div> <!-- #primary -->
 
+<?php get_sidebar( 'handbook' ); ?>
+
 <?php get_footer(); ?>
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/style.css

@@ -916 +916 @@
     padding: 0;
     text-transform: none;
-}
-
-.o2-app-page-title a {
-    color: #0072a9;
-}
-.o2-app-page-title a:visited {
-    color: #4ca6cf;
-}
-
-.home .o2-app-page-title {
-    display: none;
+    color: inherit;
 }
 
@@ -1099 +1089 @@
 .o2-xpost-author {
     margin: 5px 0 0 0;
-    line-height: 1.3;
 }
 
@@ -1108 +1097 @@
 .o2-xpost-author .entry-date {
     padding-left: unset;
+}
+
+h2.o2-xpost-content {
+    font-size: var(--wp--preset--font-size--normal) !important;
+    font-weight: 400;
+    text-wrap: pretty;
+    line-height: var(--wp--custom--body--short-text--typography--line-height) !important;
 }