From 6eefde36ff9c2e5a5692698795fcf8be5b84841a Mon Sep 17 00:00:00 2001
From: Steffen Wilberg <steffen.wilberg@web.de>
Date: Tue, 27 Dec 2011 14:26:18 +0100
Subject: [PATCH] Bug 713072: Bring the 'Licensing information' link in about:
 in line with the other links. r=mfinkle

---
 mobile/android/chrome/content/about.xhtml     |  3 ++-
 mobile/android/locales/en-US/chrome/about.dtd | 16 +++++-----------
 mobile/android/themes/core/aboutPage.css      |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mobile/android/chrome/content/about.xhtml b/mobile/android/chrome/content/about.xhtml
index b21d1d40c9ea..fc9b3bdeee79 100644
--- a/mobile/android/chrome/content/about.xhtml
+++ b/mobile/android/chrome/content/about.xhtml
@@ -84,11 +84,12 @@
       <li><a href="about:rights">&aboutPage.rights.label;</a></li>
       <li><a id="releaseNotesURL">&aboutPage.relNotes.label;</a></li>
       <li><a id="creditsURL">&aboutPage.credits.label;</a></li>
+      <li><a href="about:license">&aboutPage.license.label;</a></li>
       <div class="bottom-border"></div>
     </ul>
 
     <div id="aboutDetails">
-      <p id="license"><b><a href="about:license">&aboutPage.licenseLink;</a>&aboutPage.licenseLinkSuffix;</b> &logoTrademark;</p>
+      <p>&logoTrademark;</p>
     </div>
 
     <script type="application/javascript;version=1.8"><![CDATA[
diff --git a/mobile/android/locales/en-US/chrome/about.dtd b/mobile/android/locales/en-US/chrome/about.dtd
index 70be0d704333..7cc270a2a9dc 100644
--- a/mobile/android/locales/en-US/chrome/about.dtd
+++ b/mobile/android/locales/en-US/chrome/about.dtd
@@ -1,18 +1,12 @@
 <!ENTITY aboutPage.title                        "About &brandShortName;">
+<!ENTITY aboutPage.checkForUpdates.link         "Check for Updates »">
+<!ENTITY aboutPage.checkForUpdates.checking     "Looking for updates…">
+<!ENTITY aboutPage.checkForUpdates.none         "No updates available">
+<!ENTITY aboutPage.checkForUpdates.found        "Update available">
 <!ENTITY aboutPage.faq.label                    "FAQ">
 <!ENTITY aboutPage.support.label                "Support">
 <!ENTITY aboutPage.privacyPolicy.label          "Privacy Policy">
 <!ENTITY aboutPage.rights.label                 "Know Your Rights">
 <!ENTITY aboutPage.relNotes.label               "Release Notes">
 <!ENTITY aboutPage.credits.label                "Credits">
-<!ENTITY aboutPage.checkForUpdates.link         "Check for Updates »">
-<!ENTITY aboutPage.checkForUpdates.checking     "Looking for updates…">
-<!ENTITY aboutPage.checkForUpdates.none         "No updates available">
-<!ENTITY aboutPage.checkForUpdates.found        "Update available">
-
-
-<!-- LOCALIZATION NOTE:
-     These strings are concatenated in order. Unneeded strings may be left blank.
--->
-<!ENTITY aboutPage.licenseLink                  "Licensing information">
-<!ENTITY aboutPage.licenseLinkSuffix            ".">
+<!ENTITY aboutPage.license.label                "Licensing Information">
diff --git a/mobile/android/themes/core/aboutPage.css b/mobile/android/themes/core/aboutPage.css
index 960b37da88bc..fc4dba205eca 100644
--- a/mobile/android/themes/core/aboutPage.css
+++ b/mobile/android/themes/core/aboutPage.css
@@ -103,7 +103,7 @@ body {
 }
 
 #aboutLinks > li {
-  line-height: 3;
+  line-height: 2.6;
   border-top: 1px solid white;
   border-bottom: 1px solid #C1C7CC;
 }