Merge lp:~mhall119/ubuntu-website/fixes-596364 into lp:~ubuntu-website-community/ubuntu-website/light-base-theme

[Michael Hall]

[Michael Lustfield (michaellustfield)]

I noticed this on line 22:
src="http://www.ubuntu.com//sites/default/themes/ubuntu10/logo.png"

There is an extra / "com//sites".
I'm curious. Should we link to an image on another server. This will involve an additional DNS resolution to pull it down. For the sake of the base theme I can see this remaining but I can't see it being a good idea to replicate through the other branches.

Aside from that, I think the diff looks great.

review: Approve (extra-touchup)

Unmerged revisions

3. By Michael Hall <mhall@mhall-laptop> on 2010-06-19

Wrap top-loco and loco text in a link to the site root

=== modified file 'css/default.css'
--- css/default.css	2010-06-17 08:02:30 +0000
+++ css/default.css	2010-06-19 21:12:29 +0000
@@ -139,7 +139,7 @@
 #page-header .container                                                                         { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; }
 #top-logo                                                                                       { color:#fff; line-height:1.5em; text-align:right; }
 #the-logo                                                                                       { padding-left:4px; }
-#loco                                                                                           { clear:both; display:block; float:right;}
+#loco                                                                                           { clear:both; display:block; float:right; color:#fff}
 
 
 #main-nav                                                                                       { border-left: 1px solid #EF7149; z-index:10;}

=== modified file 'index.html'
--- index.html	2010-06-14 15:26:09 +0000
+++ index.html	2010-06-19 21:12:29 +0000
@@ -37,8 +37,9 @@
                         <a class="main-nav-item" href="javascript:void(0)" title="Item 4">Page Shorter 4</a>
                         <a class="main-nav-item" href="javascript:void(0)" title="Item 5">Page 5</a>
                 </nav>
+		<a href="/">
                 <h1 id="top-logo"><img class="png" id="the-logo" src="http://www.ubuntu.com//sites/default/themes/ubuntu10/logo.png" alt="Ubuntu" width="118" height="27" /><span id="loco">Country Loco Team </span></h1>
-
+		</a>
                 </div>
         </header>