Ticket #3234: 3234-2.patch

bp-themes/bp-default/_inc/css/default.css

@@ -128 +128 @@
         z-index: 1000;
 }
 #header #search-bar {
-        position: absolute;
-        top: 25px;
-        right: 0;
-        width: 100%;
+        margin-top: 5px;
         text-align: right;
+        width: 100%;
 }
 #header #search-bar .padder {
-        padding: 10px 20px;
+        padding: 10px 15px 0 20px;
 }
 #header #search-bar input[type=text] {
         -moz-border-radius: 3px;
@@ -151 +149 @@
         margin-left: 4px;
 }
 #header h1 {
-        bottom: 30px;
-        line-height: 230%;
-        left: 20px;
+        float: left;
         margin-bottom: 0;
-        position: absolute;
-        width: 44%;
+        margin-top: 0;
 }
 #header h1 a {
         color: #fff;

bp-themes/bp-default/header.php

@@ -23 +23 @@
                 <?php do_action( 'bp_before_header' ) ?>
 
                 <div id="header">
-                        <h1 id="logo" role="banner"><a href="<?php echo home_url() ?>" title="<?php echo _x( 'Home', 'Home page banner link title', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
-
-                        <div id="navigation" role="navigation">
-                                <?php wp_nav_menu( array( 'container' => false, 'menu_id' => 'nav', 'theme_location' => 'primary', 'fallback_cb' => 'bp_dtheme_main_nav' ) ); ?>
-                        </div>
-
                         <div id="search-bar" role="search">
                                 <div class="padder">
+                                        <h1 id="logo" role="banner"><a href="<?php echo home_url() ?>" title="<?php echo _x( 'Home', 'Home page banner link title', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
 
-                                <?php if ( bp_search_form_enabled() ) : ?>
+                                        <?php if ( bp_search_form_enabled() ) : ?>
 
-                                        <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
-                                                <input type="text" id="search-terms" name="search-terms" value="<?php echo isset( $_REQUEST['s'] ) ? esc_attr( $_REQUEST['s'] ) : ''; ?>" />
+                                                <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+                                                        <input type="text" id="search-terms" name="search-terms" value="<?php echo isset( $_REQUEST['s'] ) ? esc_attr( $_REQUEST['s'] ) : ''; ?>" />
 
-                                                <?php echo bp_search_form_type_select() ?>
+                                                        <?php echo bp_search_form_type_select() ?>
 
-                                                <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+                                                        <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 
-                                                <?php wp_nonce_field( 'bp_search_form' ) ?>
+                                                        <?php wp_nonce_field( 'bp_search_form' ) ?>
 
-                                        </form><!-- #search-form -->
+                                                </form><!-- #search-form -->
 
-                                <?php endif; ?>
+                                        <?php endif; ?>
 
                                 <?php do_action( 'bp_search_login_bar' ) ?>
 
                                 </div><!-- .padder -->
                         </div><!-- #search-bar -->
 
+                        <div id="navigation" role="navigation">
+                                <?php wp_nav_menu( array( 'container' => false, 'menu_id' => 'nav', 'theme_location' => 'primary', 'fallback_cb' => 'bp_dtheme_main_nav' ) ); ?>
+                        </div>
+
                         <?php do_action( 'bp_header' ) ?>
 
                 </div><!-- #header -->