launchpad-reviewers team mailing list archive

[Guruprasad <mp+421627@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:new-launchpad-logo into launchpad:master.

Commit message:
Update the Launchpad logos to the new versions

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/421627
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:new-launchpad-logo into launchpad:master.

diff --git a/lib/canonical/launchpad/images/launchpad-logo-and-name-hierarchy.png b/lib/canonical/launchpad/images/launchpad-logo-and-name-hierarchy.png
deleted file mode 100644
index 9bfe3a6..0000000
Binary files a/lib/canonical/launchpad/images/launchpad-logo-and-name-hierarchy.png and /dev/null differ
diff --git a/lib/canonical/launchpad/images/launchpad-logo-and-name.png b/lib/canonical/launchpad/images/launchpad-logo-and-name.png
index 2fa643b..2d9ba6c 100644
Binary files a/lib/canonical/launchpad/images/launchpad-logo-and-name.png and b/lib/canonical/launchpad/images/launchpad-logo-and-name.png differ
diff --git a/lib/canonical/launchpad/images/launchpad-logo.png b/lib/canonical/launchpad/images/launchpad-logo.png
index ae3fbe4..e2968d7 100644
Binary files a/lib/canonical/launchpad/images/launchpad-logo.png and b/lib/canonical/launchpad/images/launchpad-logo.png differ
diff --git a/lib/canonical/launchpad/images/launchpad.png b/lib/canonical/launchpad/images/launchpad.png
index 7db6e67..683c77f 100644
Binary files a/lib/canonical/launchpad/images/launchpad.png and b/lib/canonical/launchpad/images/launchpad.png differ
diff --git a/lib/canonical/launchpad/offline-maintenance-haproxy.html b/lib/canonical/launchpad/offline-maintenance-haproxy.html
index 2625cc1..329ae2e 100644
--- a/lib/canonical/launchpad/offline-maintenance-haproxy.html
+++ b/lib/canonical/launchpad/offline-maintenance-haproxy.html
@@ -39,7 +39,8 @@ Content-Type: text/html
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.test/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/canonical/launchpad/offline-maintenance.html b/lib/canonical/launchpad/offline-maintenance.html
index 2a2e23f..2ed31ff 100644
--- a/lib/canonical/launchpad/offline-maintenance.html
+++ b/lib/canonical/launchpad/offline-maintenance.html
@@ -32,7 +32,8 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/canonical/launchpad/offline-staging-code-update.html b/lib/canonical/launchpad/offline-staging-code-update.html
index 2ab271f..754c671 100644
--- a/lib/canonical/launchpad/offline-staging-code-update.html
+++ b/lib/canonical/launchpad/offline-staging-code-update.html
@@ -35,7 +35,8 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/canonical/launchpad/offline-staging-db-update.html b/lib/canonical/launchpad/offline-staging-db-update.html
index 89abf8b..a50d193 100644
--- a/lib/canonical/launchpad/offline-staging-db-update.html
+++ b/lib/canonical/launchpad/offline-staging-db-update.html
@@ -35,7 +35,8 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/canonical/launchpad/offline-unplanned-haproxy.html b/lib/canonical/launchpad/offline-unplanned-haproxy.html
index af9dec6..04965a0 100644
--- a/lib/canonical/launchpad/offline-unplanned-haproxy.html
+++ b/lib/canonical/launchpad/offline-unplanned-haproxy.html
@@ -50,7 +50,8 @@ Content-Type: text/html
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/canonical/launchpad/offline-unplanned.html b/lib/canonical/launchpad/offline-unplanned.html
index e232c58..ef1717a 100644
--- a/lib/canonical/launchpad/offline-unplanned.html
+++ b/lib/canonical/launchpad/offline-unplanned.html
@@ -43,7 +43,8 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="/@@/launchpad-logo-and-name.png"
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index d9edb89..c82b4b3 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -267,7 +267,7 @@
   <div id="footer" class="footer">
     <div class="lp-arcana" tal:condition="not:view/is_root_page|nothing">
         <div class="lp-branding">
-          <a tal:attributes="href string:${rooturl}"><img src="/@@/launchpad-logo-and-name-hierarchy.png" alt="Launchpad"/></a>
+          <a tal:attributes="href string:${rooturl}"><img src="/@@/launchpad-logo-and-name.png" alt="Launchpad" height="18"/></a>
           &nbsp;&bull;&nbsp;
           <a tal:attributes="href string:${rooturl}+tour">Take the tour</a>
           &nbsp;&bull;&nbsp;
@@ -368,4 +368,3 @@
     condition="python: count != 1"
     replace="l_plural" /></metal:plural-msg>
 </macros>
-
diff --git a/lib/lp/app/templates/launchpad-databaseunavailable.pt b/lib/lp/app/templates/launchpad-databaseunavailable.pt
index 6b748aa..1e7d025 100644
--- a/lib/lp/app/templates/launchpad-databaseunavailable.pt
+++ b/lib/lp/app/templates/launchpad-databaseunavailable.pt
@@ -45,7 +45,8 @@
         </div>
         <div id="footer">
           <a href="https://launchpad.net/";>
-            <img src="https://launchpad.net/@@/launchpad-logo-and-name-hierarchy.png";
+            <img src="https://launchpad.net/@@/launchpad-logo-and-name.png";
+            width="100"
             alt="Launchpad" />
           </a>
         </div>
diff --git a/lib/lp/app/templates/root-index.pt b/lib/lp/app/templates/root-index.pt
index 864ef07..75084b9 100644
--- a/lib/lp/app/templates/root-index.pt
+++ b/lib/lp/app/templates/root-index.pt
@@ -44,6 +44,9 @@
           padding-bottom: .5em;
           border-bottom: 1px dotted #999;
           }
+      #launchpad-logo-and-name {
+          width: 250px;
+          }
     </style>
   </metal:head>
   <body>
@@ -60,7 +63,7 @@
 
         <div class="top-portlet" style="border-bottom: 1px dotted #999;">
           <img src="/@@/launchpad-logo-and-name.png"
-               id="launchpad-logo-and-name" alt=""
+               id="launchpad-logo-and-name" alt="Launchpad logo and name"
                style="margin: 0 9em 1em 0"/>
         </div>