commit ad06d1ca99f2dfd110ca10349db6c4a889f67d48 Author: Georg Koppen gk@torproject.org Date: Tue Jan 22 08:00:28 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 | 13 +++++++++++++ src/chrome/skin/icon-newsletter.png | Bin 0 -> 649 bytes 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6082db0c..a4ba2a84 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -60,9 +60,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; &#187;</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 d53860a5..4c495b8c 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -144,6 +144,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). + */ +@media only screen and (min-width: 768px) { + #bottom br { + display: none; + } +} + .searchbox form { width: 500px; margin: 39px auto 0px auto; 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