Merge lp:~cjohnston/ubuntu-community-webthemes/top-nav into lp:ubuntu-community-webthemes/light-django-theme

[Chris Johnston]

[lp:~cjohnston/ubuntu-community-webthemes/top-nav]

33. By Chris Johnston on 2011-03-10

fixes background color of top-nav

34. By Chris Johnston on 2011-03-14

Made fixes suggested by Ronnie

=== modified file 'css_search.pl' (properties changed: +x to -x)
=== modified file 'media/css/default.css'
--- media/css/default.css	2011-02-26 15:06:54 +0000
+++ media/css/default.css	2011-03-14 19:16:06 +0000
@@ -233,7 +233,7 @@
 
 .top-nav-item { 
     display:inline-block; 
-    padding:0 8px; 
+    margin-right: 14px; 
     line-height:2em; 
 }
 
@@ -250,7 +250,7 @@
 
 #top-related { 
     float:right; 
-    margin-right:15px; 
+    margin-right:2px; 
 }
 
 #main-nav {
@@ -596,10 +596,10 @@
 }
 
 #top-nav { 
-    background-color:#f7f7f7; 
+    background-color:#ffffff; 
 }
 
-.top-nav-item { 
+.top-nav-item, .top-nav-item:visited { 
     color:#333333; 
 }
 

=== modified file 'templates/ubuntu_website_base.html'
--- templates/ubuntu_website_base.html	2011-02-26 15:06:54 +0000
+++ templates/ubuntu_website_base.html	2011-03-14 19:16:06 +0000
@@ -49,12 +49,10 @@
                 </section>
                 <nav id="top-related">
                     {% block top_nav_related_links %}
-                    <a class="top-nav-item" href="www.ubuntu.com">Ubuntu.com</a>
-                    <a class="top-nav-item" href="ubuntuforums.org">Support</a>
-                    <a class="top-nav-item" href="wiki.ubuntu.com">Documentation</a>
-                    <a class="top-nav-item" href="fridge.ubuntu.com">News</a>
-                    <a class="top-nav-item" href="planet.ubuntu.com">Blogs</a>
-                    <a class="top-nav-item" href="loco.ubuntu.com">Loco Directory</a>
+                    <a class="top-nav-item" href="http://www.ubuntu.com">Ubuntu.com</a>
+                    <a class="top-nav-item" href="http://www.ubuntu.com/community">Community</a>
+                    <a class="top-nav-item" href="http://www.ubuntu.com/support">Support</a>
+                    <a class="top-nav-item" href="http://www.ubuntu.com/partners">Partners</a>
                     {% endblock %}
                 </nav>
             </div>