Merge lp:~salgado/ubuntu-community-webthemes/ubuntu-logo-to-css into lp:ubuntu-community-webthemes/light-django-theme

[Guilherme Salgado]

Move the URL for the Ubuntu logo from the base template to css so that it can be more easily replaced

=== modified file 'media/css/default.css'
--- media/css/default.css	2011-03-14 19:11:05 +0000
+++ media/css/default.css	2011-04-19 20:30:59 +0000
@@ -288,10 +288,6 @@
     width: 180px;
 }
 
-#the-logo {
-    float: right
-}
-
 #page-related {
     background-image: none;
     margin: 0 auto;
@@ -631,7 +627,12 @@
 }
 
 #the-logo {
-    padding-left: 4px
+    background: url("http://www.ubuntu.com/sites/default/themes/ubuntu10/logo.png");
+    width: 118px;
+    height: 27px;
+    display: block;
+    clear: both;
+    float: right
 }
 
 #loco {

=== modified file 'templates/ubuntu_website_base.html'
--- templates/ubuntu_website_base.html	2011-03-10 01:38:25 +0000
+++ templates/ubuntu_website_base.html	2011-04-19 20:30:59 +0000
@@ -72,7 +72,7 @@
                 </nav>
                 <h1 id="top-logo">
 		<a href="{% block logo_href %}/{% endblock %}">
-                {% block logo_img %}<img class="png" id="the-logo" src="http://www.ubuntu.com//sites/default/themes/ubuntu10/logo.png" alt="Ubuntu" width="118" height="27" />{% endblock %}
+                {% block logo_img %}<span id="the-logo"></span>{% endblock %}
                 <span id="loco">{% block logo_text %}Country Loco Team{% endblock %}</span>
 		</a>
                 </h1>