[tbb-commits] [torbutton/master] Bug 29035: Add link for newsletter sign-up

[gk at torproject.org]

commit c097649928aebba435f0379151c25388c924f3cb
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jan 18 09:29:21 2019 +0000

    Bug 29035: Add link for newsletter sign-up
    
    Patch based on a version written by Arthur Edelstein
---
 src/chrome/content/aboutTor/aboutTor.xhtml |   7 +++++--
 src/chrome/skin/aboutTor.css               |  16 +++++++++++++++-
 src/chrome/skin/icon-newsletter.png        | Bin 0 -> 649 bytes
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index 5ddf6ab9..639c2fca 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -62,9 +62,12 @@ window.addEventListener("pageshow", function() {
     </div>
 
     <div id="bottom">
-      <p class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label;
+      <p id="manual" class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label;
         <a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p>
-      <p>&aboutTor.tor_mission.label;
+      <p id="newsletter" class="moreInfoLink"><img class="imageStyle" src="resource://torbutton-assets/icon-newsletter.png"/><br/>&aboutTor.newsletter.tagline;<br/>
+        <a href="https://newsletter.torproject.org">&aboutTor.newsletter.link_text; »</a>
+      </p>
+      <p id="mission">&aboutTor.tor_mission.label;
         <a href="&aboutTor.getInvolved.link;">&aboutTor.getInvolved.label;</a></p>
     </div>
   </div>
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 982b147a..1bdf301d 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -149,6 +149,19 @@ body:not([showmanual]) .showForManual {
   font-size: 15px;
 }
 
+#bottom img.imageStyle {
+  padding-inline-end: 10px;
+}
+
+/* Hide the linebreaks on large enough screens (desktops, laptops, and
+ * tablets).
+ */
+ at media only screen and (min-width: 768px) {
+  #bottom br {
+    display: none;
+  }
+}
+
 .searchbox form {
   width: 500px;
   margin: 39px auto 0px auto;
@@ -293,7 +306,8 @@ body:not([showmanual]) .showForManual {
 body[mobile] #torstatus-version,
 body[mobile] .searchbox,
 body[mobile] .top .heading2,
-body[mobile] #bottom {
+body[mobile] #manual,
+body[mobile] #mission {
   display: none;
 }
 
diff --git a/src/chrome/skin/icon-newsletter.png b/src/chrome/skin/icon-newsletter.png
new file mode 100644
index 00000000..7532ba9c
Binary files /dev/null and b/src/chrome/skin/icon-newsletter.png differ