This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master in repository torbutton.

The following commit(s) were added to refs/heads/master by this push: new 9b2e9ad3 Bug 40886: Amend about:tor on Nightly and Alpha to encourage testing 9b2e9ad3 is described below

commit 9b2e9ad32e4be1a64b95f7b9de96018096d35b1e Author: Richard Pospesel richard@torproject.org AuthorDate: Wed Apr 20 20:24:22 2022 +0000

Bug 40886: Amend about:tor on Nightly and Alpha to encourage testing --- chrome/content/aboutTor/aboutTor.xhtml | 15 ++++++++++++-- chrome/locale/en-US/aboutTor.dtd | 5 +++++ chrome/skin/aboutTor.css | 37 ++++++++++++++++++++++++++++++++++ chrome/skin/banner-warning.svg | 1 + 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index f1b4dab1..79b10f32 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -36,9 +36,9 @@ <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container"> - <div class="heading1">&aboutTor.ready.label;</div> + <div class="heading1">&aboutTor.alpha.ready.label;</div> <br/> - <div class="heading2">&aboutTor.ready2.label;</div> + <div class="heading2">&aboutTor.alpha.ready2.label;</div> </div> <div class="showIfHasBeenUpdated torstatus-container"> <div class="heading1">&aboutTBUpdate.updated;</div> @@ -65,6 +65,17 @@ </form> </div>

+ <div id="bannerRoot"> + <img id="bannerImg" src="resource://torbutton-assets/banner-warning.svg" /> + <div id="bannerTextCol"> + <!--<div id="bannerHeader"></div> + <br />--> + <div id="bannerDescription">&aboutTor.alpha.bannerDescription;</div> + <br /> + <a id="bannerLink" target="_blank" href="https://forum.torproject.net/">&aboutTor.alpha.bannerLink;</a> + </div> + </div> + <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/" target="_blank">&aboutTor.donationBanner.buttonA; &#187;</a> diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 7b231095..2d565737 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -29,3 +29,8 @@ <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> + +<!ENTITY aboutTor.alpha.ready.label "Test. Thoroughly."> +<!ENTITY aboutTor.alpha.ready2.label "You’re ready to test the world’s most private browsing experience."> +<!ENTITY aboutTor.alpha.bannerDescription "Tor Browser Alpha is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release."> +<!ENTITY aboutTor.alpha.bannerLink "Report a bug on the Tor Forum"> \ No newline at end of file diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 1811c4d5..81b6453e 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -210,6 +210,43 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ }

+#bannerRoot { + width: 690px; + padding: 20px 25px 25px; + background: rgba(0, 0, 0, 0.3); + border-radius: 6px; + margin: 35px auto 0px; + display: flex; + flex-direction: row; + align-items: flex-start; + position: static; +} + +#bannerTextCol { + padding: 8px 0px 0px 15px; + font-size: 15px; + line-height: normal; + color: #FFFFFF; + width: 633px; +} + +#bannerHeader { + font-weight: bold; +} + +#bannerImg { + width: 32px; + position: static; +} + +a#bannerLink { + text-decoration: underline; +} + +a#bannerLink:hover { + text-decoration: none; +} + /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/banner-warning.svg b/chrome/skin/banner-warning.svg new file mode 100644 index 00000000..2f4bf1b8 --- /dev/null +++ b/chrome/skin/banner-warning.svg @@ -0,0 +1 @@ +<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><circle cx="16" cy="16" fill="#ffa436" r="16"/><g fill="#0c0c0d"><path d="m14.2303 23.393c-3.5375-.6033-6.2303-3.6837-6.2303-7.393 0-4.1421 3.3579-7.5 7.5-7.5s7.5 3.3579 7.5 7.5c0 .669-.0876 1.3176-.252 1.9349l-.9277-1.6176c.0052-.1051.0078-.2109.0078-.3173 0-3.4949-2.8332-6.32812-6.3281-6.32812s-6.32812 2.83322-6.32812 6.32812c0 2.9851 2.06682 5.4874 4.84752 6.154-.06.4351.0216.8644.2109 1.239 [...] \ No newline at end of file