Commit 64f16026 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Bug 20414.3: Delay banner 1 week & add pt locale

Also, improve donate button appearance by moving arrow below text
and choosing a narrow arrow.
parent 516ada58
...@@ -180,7 +180,9 @@ window.addEventListener("pageshow", function() { ...@@ -180,7 +180,9 @@ window.addEventListener("pageshow", function() {
href="https://www.torproject.org/donate/donate-tbb"> href="https://www.torproject.org/donate/donate-tbb">
<div id="banner-donate-button-container"> <div id="banner-donate-button-container">
<div id="banner-donate-button"> <div id="banner-donate-button">
<div id="banner-donate-button-text"></div> <div id="banner-donate-button-text">
<span></span>
</div>
<div id="banner-donate-button-arrow"></div> <div id="banner-donate-button-arrow"></div>
</div> </div>
</div> </div>
......
...@@ -9,6 +9,7 @@ let kBannerLocales = [ ...@@ -9,6 +9,7 @@ let kBannerLocales = [
"fr", "fr",
"it", "it",
"nl", "nl",
"pt",
"ru", "ru",
"tr", "tr",
"vi", "vi",
...@@ -58,9 +59,9 @@ let shouldShowBanner = function () { ...@@ -58,9 +59,9 @@ let shouldShowBanner = function () {
kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) {
return false; return false;
} }
// Only show banner between 2016 Nov 15 and 2017 Jan 25. // Only show banner between 2016 Nov 22 and 2017 Jan 25.
let now = new Date(); let now = new Date();
let start = new Date(2016, 10, 15); let start = new Date(2016, 10, 22);
let end = new Date(2017, 0, 26); let end = new Date(2017, 0, 26);
let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count";
if (now < start || now > end) { if (now < start || now > end) {
...@@ -122,7 +123,7 @@ let avoidWidows = function (element) { ...@@ -122,7 +123,7 @@ let avoidWidows = function (element) {
let updateTextSizes = function () { let updateTextSizes = function () {
fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-tagline"));
fitTextInElement(sel("#banner-heart")); fitTextInElement(sel("#banner-heart"));
fitTextInElement(sel("#banner-donate-button")); fitTextInElement(sel("#banner-donate-button-text"));
avoidWidows(sel("#banner-tagline span")); avoidWidows(sel("#banner-tagline span"));
}; };
...@@ -143,9 +144,9 @@ let runDonationBanner = function () { ...@@ -143,9 +144,9 @@ let runDonationBanner = function () {
sel("#banner-tagline span").innerText = getTagline(randomInteger(4)); sel("#banner-tagline span").innerText = getTagline(randomInteger(4));
sel("#banner-heart span").innerText = sel("#banner-heart span").innerText =
gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); gStringBundle.GetStringFromName("aboutTor.donationBanner.heart");
sel("#banner-donate-button-text").innerHTML = sel("#banner-donate-button-text span").innerHTML =
gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); gStringBundle.GetStringFromName("aboutTor.donationBanner.donate");
sel("#banner-donate-button-arrow").innerHTML = "&#9654;"; sel("#banner-donate-button-arrow").innerHTML = "&#10230;";
sel("#banner").style.display = "flex"; sel("#banner").style.display = "flex";
sel("#banner-spacer").style.display = "block"; sel("#banner-spacer").style.display = "block";
addEventListener("resize", updateTextSizes); addEventListener("resize", updateTextSizes);
......
...@@ -96,10 +96,10 @@ ...@@ -96,10 +96,10 @@
letter-spacing: -0.00em; letter-spacing: -0.00em;
opacity: 100%; opacity: 100%;
padding-bottom: 5px; padding-bottom: 5px;
padding-left: 15px; padding-left: 5px;
padding-right: 15px; padding-right: 5px;
padding-top: 5px; padding-top: 5px;
width: 80px; width: 100px;
} }
#banner-donate-button-container:hover { #banner-donate-button-container:hover {
border-color: #610; border-color: #610;
...@@ -110,16 +110,25 @@ ...@@ -110,16 +110,25 @@
#banner-donate-button { #banner-donate-button {
align-items: center; align-items: center;
display: flex; display: flex;
flex-direction: column;
font-family: sans-serif; font-family: sans-serif;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
height: 100%; height: 100%;
text-align: start; text-align: center;
width: 100%; width: 100%;
} }
#banner-donate-button-text {
align-self: stretch;
align-items: center;
display: flex;
justify-content: center;
flex: 2 2 67%;
}
#banner-donate-button-arrow { #banner-donate-button-arrow {
flex: 1 1 33%;
font-size: 14px; font-size: 14px;
margin-inline-start: 5px; line-height: 14px;
} }
#banner-donate-button-arrow:-moz-dir(rtl) { #banner-donate-button-arrow:-moz-dir(rtl) {
transform: scaleX(-1); transform: scaleX(-1);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment