Merge lp:~cjohnston/ubuntu-community-webthemes/wordpress-design-update into lp:ubuntu-community-webthemes/light-wordpress-theme

[Chris Johnston]

[Stas Sușcov (sushkov)]

Looks ok to me, except two things:
* The top bar strings have to be available for localisation, I can edit the patch later to fix that if you're ok with it
* The font change might be an issue. Right now the Google Fonts webservice is not offering full characters support for Ubuntu font family (see http://code.google.com/p/google-ajax-apis/issues/detail?id=557 for example). For Romanian language it's an issue, I don't if it's true for other languages.

Thanks.

[Stas Sușcov (sushkov)]

Merged, thanks!

review: Approve

=== modified file 'functions.php'
--- functions.php	2011-03-12 03:58:13 +0000
+++ functions.php	2011-07-19 12:21:43 +0000
@@ -73,15 +73,6 @@
         'after_title'   => '',
         'description'   => 'Secondary navigation menu.',
     ) );
-    register_sidebar( array (
-        'name' => 'Top Bar',
-        'id' => 'top-bar-container',
-        'before_widget' => '',
-        'after_widget'  => '',
-        'before_title'  => '<span class="top-bar-title">',
-        'after_title'   => '</span>',
-        'description'   => 'Top bar content. Just drag-n-drop a links/menu widget...',
-    ) );
 }
 
 /**
@@ -216,7 +207,14 @@
     <div id="top-bar">
         <?php if (is_sidebar_active('top-bar-container')): ?>
             <div class="top-bar-container">
-                <?php dynamic_sidebar('top-bar-container'); ?>
+                <div class="top-bar-container">
+                    <ul>
+                        <li><a href="http://www.ubuntu.com">Ubuntu.com</a></li>
+                        <li><a href="http://www.ubuntu.com/community">Community</a></li>
+                        <li><a href="http://www.ubuntu.com/support">Support</a></li>
+                        <li><a href="http://www.ubuntu.com/partners">Partners</a></li>
+                    </ul>
+                </div>
             </div>
         <?php endif; ?>
     </div>
 
=== modified file 'style.css'
--- style.css	2011-06-13 13:27:40 +0000
+++ style.css	2011-07-19 12:21:43 +0000
@@ -184,6 +184,7 @@
 /*
 Typography
 */
+<<<<<<< TREE
 body { font-family: 'Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; }
 body { color: #333; font-size: 90%; line-height: 1.5; }
 h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #772953; }
@@ -191,10 +192,19 @@
 h2 { font-size: 160%; margin-bottom: 10px; font-weight: bold; }
 h3 { font-size: 140%; margin-bottom: 10px; }
 h4 { font-size: 120%; margin-bottom: 10px; }
+=======
+body { font-family: 'Ubuntubeta', 'Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; }
+body { color: #333; font-size: 13px; line-height: 1.4; }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #333333; }
+h1 { font-size: 36px; margin-bottom: 0px; line-height: 40px; }
+h2 { font-size: 24px; margin-bottom: 8px; margin-top: 16px; line-height: 28px; }
+h3 { font-size: 16px; margin-bottom: 8px; margin-top: 16px; line-height: 20px; }
+h4 { font-size: 110%; margin-bottom: 0px; }
+>>>>>>> MERGE-SOURCE
 h5 { font-size: 110%; font-weight: bold; margin-bottom: 10px; }
 h6 { font-size: 110%; font-weight: bold; }
-a, a:active { color: #772953; }
-a:hover { color: #DD4814; }
+a, a:active { color: #DD4814; }
+a:hover { color: #DD4814; text-decoration: underline; }
 a:visited { color: #777777; }
 #top-bar { text-align: right; line-height: 20px; font-size: 90%; }
 #top-bar .top-bar-title { display: none; }