<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4418] trunk/bp-themes/bp-default: Fit a longer site title into the page header.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4418</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-24 19:34:43 +0000 (Tue, 24 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fit a longer site title into the page header. Fixes #3234, props karmatosed for initial patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4417 => 4418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css        2011-05-24 18:30:23 UTC (rev 4417)
+++ trunk/bp-themes/bp-default/_inc/css/default.css        2011-05-24 19:34:43 UTC (rev 4418)
</span><span class="lines">@@ -128,14 +128,12 @@
</span><span class="cx">         z-index: 1000;
</span><span class="cx"> }
</span><span class="cx"> #header #search-bar {
</span><del>-        position: absolute;
-        top: 25px;
-        right: 0;
-        width: 100%;
</del><ins>+        margin-top: 5px;
</ins><span class="cx">         text-align: right;
</span><ins>+        width: 100%;
</ins><span class="cx"> }
</span><span class="cx"> #header #search-bar .padder {
</span><del>-        padding: 10px 20px;
</del><ins>+        padding: 10px 15px 0 20px;
</ins><span class="cx"> }
</span><span class="cx"> #header #search-bar input[type=text] {
</span><span class="cx">         -moz-border-radius: 3px;
</span><span class="lines">@@ -151,12 +149,9 @@
</span><span class="cx">         margin-left: 4px;
</span><span class="cx"> }
</span><span class="cx"> #header h1 {
</span><del>-        bottom: 30px;
-        line-height: 230%;
-        left: 20px;
</del><ins>+        float: left;
</ins><span class="cx">         margin-bottom: 0;
</span><del>-        position: absolute;
-        width: 44%;
</del><ins>+        margin-top: 0;
</ins><span class="cx"> }
</span><span class="cx"> #header h1 a {
</span><span class="cx">         color: #fff;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (4417 => 4418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php        2011-05-24 18:30:23 UTC (rev 4417)
+++ trunk/bp-themes/bp-default/header.php        2011-05-24 19:34:43 UTC (rev 4418)
</span><span class="lines">@@ -23,35 +23,34 @@
</span><span class="cx">                 <?php do_action( 'bp_before_header' ) ?>
</span><span class="cx">
</span><span class="cx">                 <div id="header">
</span><del>-                        <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>
-
</del><span class="cx">                         <div id="search-bar" role="search">
</span><span class="cx">                                 <div class="padder">
</span><ins>+                                        <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>
</ins><span class="cx">
</span><del>-                                <?php if ( bp_search_form_enabled() ) : ?>
</del><ins>+                                        <?php if ( bp_search_form_enabled() ) : ?>
</ins><span class="cx">
</span><del>-                                        <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'] ) : ''; ?>" />
</del><ins>+                                                <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'] ) : ''; ?>" />
</ins><span class="cx">
</span><del>-                                                <?php echo bp_search_form_type_select() ?>
</del><ins>+                                                        <?php echo bp_search_form_type_select() ?>
</ins><span class="cx">
</span><del>-                                                <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</del><ins>+                                                        <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</ins><span class="cx">
</span><del>-                                                <?php wp_nonce_field( 'bp_search_form' ) ?>
</del><ins>+                                                        <?php wp_nonce_field( 'bp_search_form' ) ?>
</ins><span class="cx">
</span><del>-                                        </form><!-- #search-form -->
</del><ins>+                                                </form><!-- #search-form -->
</ins><span class="cx">
</span><del>-                                <?php endif; ?>
</del><ins>+                                        <?php endif; ?>
</ins><span class="cx">
</span><span class="cx">                                 <?php do_action( 'bp_search_login_bar' ) ?>
</span><span class="cx">
</span><span class="cx">                                 </div><!-- .padder -->
</span><span class="cx">                         </div><!-- #search-bar -->
</span><span class="cx">
</span><ins>+                        <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>
+
</ins><span class="cx">                         <?php do_action( 'bp_header' ) ?>
</span><span class="cx">
</span><span class="cx">                 </div><!-- #header -->
</span></span></pre>
</div>
</div>
</body>
</html>