- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a Merge: 0166d3d fbb72c6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:16:59 2018 +0000 Merge remote-tracking branch 'arthur/28082' rbm.conf | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-launcher/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 3aa20983122b4aaed6ae77cfc5bdb48107aa33a4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:41:50 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- src/chrome/content/network-settings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index aaa91ac..1599c28 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -306,17 +306,21 @@ function populateLocaleList(aLangPackAddons) "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", "ca" : "català", + "cs" : "\u010De\u0161tina", "da" : "Dansk", "de" : "Deutsch", + "el" : "\u03B5\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "hu" : "Magyar nyelv", "id" : "bahasa Indonesia", "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", + "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l",

1 0

[torbutton/master] Bug 28082: Add locales cs, el, hu, ka
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c94a5589ffeabf71ea95c3c5c1a3396bdbe14da5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 16 20:10:02 2018 -0700 Bug 28082: Add locales cs, el, hu, ka --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..8f562208 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar ca cs da de el es fa fr ga he hu id is it ja ka ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 38cc505106a37e704ce11a41d22b74cfde36449f Merge: 9e5c4406 c94a5589 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:17:17 2018 +0000 Merge remote-tracking branch 'arthur/28082' trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge branch 'bug_26475_v2'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 0166d3d70e81c6c1072e03f6b950c8b2eb181343 Merge: 8d7c170 e2da10a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:11:14 2018 +0000 Merge branch 'bug_26475_v2' projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/master] Bug 26475: Disable building Rust with Thin LTO
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit e2da10a29f46762a8561e30c36915f8568d18c71 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 09:48:59 2018 +0000 Bug 26475: Disable building Rust with Thin LTO Building Rust with Thin LTO enabled leads to Tor Browser builds on macOS and probably Linux not being reproducible. The exact reason for that is unknown at the moment, although it seems fixed testing nightly Rust source tarballs as of mid-September 2018. We therefore disable Thin LTO for now by setting `codegen-units` to `1`. --- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d56ad3..a87bf35 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -49,9 +49,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# We need to disable for Stylo right now, as we have reproducibility issues on -# macOS with it enabled, see: #26475. -ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/rust/build b/projects/rust/build index 936f49f..61a5d50 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -65,6 +65,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] + +# We need to disable Thin LTO due to reproducibility issues on macOS and +# probably Linux. Alas, there is no direct option available in the config.toml +# in 1.26.1 yet, so we need to toggle this indirectly via `codegen-units`. +[% IF c("var/osx") || c("var/linux") %] + # It seems hard to pass the proper value via ./configure so we resort to our + # old friend `sed`. + sed -i 's/#codegen-units = 1/codegen-units = 1/' config.toml +[% END %] + make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.3
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 7e115d85dbf25e55efd95c271d29e407e42b4246 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:51:43 2018 +0000 Release preparations for 8.0.3 Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ projects/tor-browser/config | 4 ++-- projects/torbutton/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index debff32..bad1ac5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.1 + firefox_platform_version: 60.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 03edcee..e189eb9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.8.22 +version: 2018.9.19 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ec0bf46..b98edcb 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 8.0.3 -- October 23 2018 + * All platforms + * Update Firefox to 60.3.0esr + * Update Torbutton to 2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Linux + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + Tor Browser 8.0.2 -- October 2 2018 * All platforms * Update Firefox to 60.2.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1647b77..50d67e0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 + sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/torbutton/config b/projects/torbutton/config index 2b2df85..df0d674 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.7 +version: 2.0.8 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index fbc9776..b4f58ed 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.2' + torbrowser_version: '8.0.3' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.1 + - 8.0.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[torbutton/maint-2.0] Release preparations for 2.0.8
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit f0a1bc906ad1808600a55af7f146c061a66779e0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:22:00 2018 +0000 Release preparations for 2.0.8 Changelog update and version bump --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 562842e9..91f32c9b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + 2.0.7 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/src/install.rdf b/src/install.rdf index cd14a7dd..544f9468 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.7</em:version> + <em:version>2.0.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.0] Bug 23925: Donation banner for YE 2018 Campaign
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 5d427ef536bd152ba7ba1471604a36aca8699407 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 15 21:15:09 2018 -0700 Bug 23925: Donation banner for YE 2018 Campaign Design by Antonela Debiasi --- src/chrome/content/aboutTor/aboutTor-content.js | 30 +++++-- src/chrome/content/aboutTor/aboutTor.xhtml | 49 +++++++--- src/chrome/content/torbutton.js | 18 ++-- src/chrome/skin/aboutTor.css | 114 +++++++++++++++++------- src/chrome/skin/donation_banner_image_3x.png | Bin 0 -> 71927 bytes src/chrome/skin/newsletter_3x.png | Bin 6735 -> 0 bytes src/defaults/preferences/preferences.js | 2 +- 7 files changed, 152 insertions(+), 61 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ff5a970b..e8f5ffa2 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,7 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", - kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", + kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -61,20 +61,24 @@ var AboutTorListener = { setupBannerClosing: function () { let that = this; - let closer = content.document.getElementById("tornews-banner-closer"); + let closer = content.document.getElementById("donation-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); - let link = content.document.querySelector("#tornews-banner-message a"); - link.addEventListener("click", function () { + let button = content.document.getElementById("donation-banner-button"); + button.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", - countdown => content.document.body.setAttribute( - "show-tornews-banner", countdown > 0)); + bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + countdown => { + if (content.document && content.document.body) { + content.document.body.setAttribute( + "show-donation-banner", countdown > 0); + } + }); }, onPageLoad: function() { @@ -124,6 +128,14 @@ var AboutTorListener = { content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; + // Don't use "Count Me In" phrase in non-en-US locales + if (!aLocale.startsWith("en")) { + let button = content.document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute("data-0"); + let theURL = button.getAttribute("href"); + button.setAttribute("href", theURL.slice(0,-2)); + } + // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 87fe8307..9256748e 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,21 +31,48 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="tornews-banner"> - <div></div> - <div id="tornews-banner-message"> - <div id="tornews-banner-icon"></div> - <div>&aboutTor.newsletter.tagline; - <a href="https://newsletter.torproject.org"> - &aboutTor.newsletter.link_text; - </a> + <div id="donation-banner"> + <div id="donation-banner-image"></div> + <div id="donation-banner-lines"> + <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> + <div id="donation-banner-line2" + data-0="&aboutTor.donationBanner.line2a;" + data-1="&aboutTor.donationBanner.line2b;" + data-2="&aboutTor.donationBanner.line2c;" + data-3="&aboutTor.donationBanner.line2d;" + data-4="&aboutTor.donationBanner.line2e;" + data-5="&aboutTor.donationBanner.line2f;"> + &aboutTor.donationBanner.line2a; </div> + <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <a id="donation-banner-button" + href="https://www.torproject.org/donate/donate-sin-tbd0-0" + type="button" + data-0="&aboutTor.donationBanner.buttonA;" + data-1="&aboutTor.donationBanner.buttonB;"> + &aboutTor.donationBanner.buttonA; + </a> </div> - <div id="tornews-banner-closer">×</div> + <div id="donation-banner-closer">×</div> </div> - +<script type="text/javascript"> + <![CDATA[ + let lineChoice = Math.floor(Math.random() * 6); + let line2 = document.getElementById("donation-banner-line2"); + let line2text = line2.getAttribute(`data-${lineChoice}`); + let line2pieces = line2text.split(" "); + let line2end = '<span>' + line2pieces.pop() + '</span>'; + line2pieces.push(line2end); + line2.innerHTML = line2pieces.join(" "); + let buttonChoice = Math.floor(Math.random() * 2); + let button = document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute(`data-${buttonChoice}`); + button.setAttribute("href", + `https://www.torproject.org/donate/donate-sin-tbd${lineChoice}-${buttonChoice}`); +]]> +</script> + <div id="torstatus-version"/> <div class="torcontent-container"> - <div id="torstatus-version"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 03dc3563..fc1a38d8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -233,10 +233,10 @@ function torbutton_init_toolbutton() } // Show the Sign Up for Tor News banner a finite number of times. -function torbutton_tornews_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); +function torbutton_donation_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); if (count > 0) { - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); } } @@ -348,10 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", + window.messageManager.addMessageListener("AboutTor:HideDonationBanner", torbutton_abouttor_message_handler); - torbutton_tornews_banner_countdown(); + torbutton_donation_banner_countdown(); setupPreferencesForMobile(); @@ -431,9 +431,9 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:HideTorNewsBanner": - torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); + case "AboutTor:HideDonationBanner": + torbutton_log(5, "message AboutTor:HideDonationBanner received"); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index ce0a2f29..9f195cfd 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -272,74 +272,126 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } -/* Tor News Signup Banner +/* Donation Banner * While this banner is present, we need to * offset the elements normally at the top of * the window. */ -#tornews-banner { +#donation-banner { display: flex; - align-items: center; + align-items: stretch; background-color: white; color: var(--abouttor-bg-toron-color); font-size: 16px; - height: 60px; - justify-content: space-between; + height: 200px; + justify-content: center; left: 0px; right: 0px; top: 0px; - transform: translateY(-60px); + position: absolute; + transform: translateY(-200px); transition: transform 200ms; + z-index: 1; } -body[show-tornews-banner="true"] #tornews-banner { +body[show-donation-banner="true"] #donation-banner { transform: translateY(0px); transition: transform 0ms; } -#tornews-banner-message { - align-items: center; - display: flex; - justify-content: center; -} - -#tornews-banner-message a { - color: var(--abouttor-bg-toron-color); -} - -#tornews-banner-icon { - background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; - background-size: cover; - height: 32px; - margin: 0px 16px; - width: 32px; +#donation-banner-image { + background: url('chrome://torbutton/skin/donation_banner_image_3x.png') no-repeat center center; + background-size: contain; + height: 190px; + margin: 10px 10px 0px 0px; + width: 400px; } -#tornews-banner-closer { +#donation-banner-closer { display: flex; align-items: center; font-size: 20px; height: 22px; justify-content: center; - margin: 4px 20px; + margin: 4px; padding: 4px; + position: absolute; + offset-inline-end: 0px; + top: 0px; width: 22px; -moz-user-select: none; } -#tornews-banner-closer:hover { +#donation-banner-closer:hover { background-color: gray; cursor: pointer; } -body[show-tornews-banner="false"] #torstatus-version, -body[show-tornews-banner="false"] #onboarding-overlay-button { +#donation-banner-lines { + align-items: start; + display: flex; + flex-direction: column; + justify-content: space-around; + padding: 20px 0px; +} + +#donation-banner-line1 { + font-size: 11px; + font-weight: bold; + text-transform: uppercase; +} + +#donation-banner-line2 { + font-size: 20px; + font-weight: bold; +} + +#donation-banner-line2 span { + background-color: #a9fef8; +} + +#donation-banner-line3 { + font-size: 14px; +} + +#donation-banner-button { + background-color: var(--abouttor-bg-toron-color); + border-radius: 3px; + border: 0px; + color: white; + font-size: 14px; + font-weight: bold; + margin: 10px 0px; + padding: 10px 24px; + text-decoration: none; +} + +#donation-banner-button:hover { + background-color: #683d7d; + cursor: pointer; +} + +body[show-donation-banner="false"] .torcontent-container, +body[show-donation-banner="false"] .onion-pattern-container, +body[show-donation-banner="false"] #torstatus-version, +body[show-donation-banner="false"] #onboarding-overlay-button { transition: transform 200ms; } -body[show-tornews-banner="true"] #torstatus-version, -body[show-tornews-banner="true"] #onboarding-overlay-button { - transform: translateY(60px); +body[show-donation-banner="true"] .torcontent-container, +body[show-donation-banner="true"] .onion-pattern-container { + transform: translateY(80px); transition: transform 0ms; } + +body[show-donation-banner="true"] .onion-pattern-container { + position: fixed; +} + +body[show-donation-banner="true"] #torstatus-version, +body[show-donation-banner="true"] #onboarding-overlay-button { + transform: translateY(200px); + transition: transform 0ms; + position: absolute; +} diff --git a/src/chrome/skin/donation_banner_image_3x.png b/src/chrome/skin/donation_banner_image_3x.png new file mode 100644 index 00000000..6eb7fbbb Binary files /dev/null and b/src/chrome/skin/donation_banner_image_3x.png differ diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png deleted file mode 100644 index 821572fa..00000000 Binary files a/src/chrome/skin/newsletter_3x.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fecf0e69..e9496c08 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.tornews_banner_countdown", 4); +pref("extensions.torbutton.donation_banner_countdown", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/maint-2.0] Bug 27959: 2018 Donation banner text ready for translation
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit a2ef9fd16c64b3f7c9b7e5fbd429225f8faaf359 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 5 10:21:45 2018 -0700 Bug 27959: 2018 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.dtd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 1400d7b5..6efb202e 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0