December 2015 - tor-commits - lists.torproject.org

[webwml/staging] remove left-border when monthly donation is checked
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit ac5d68ca9d126beda6983af3c7594675f058221f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:38:36 2015 +0800 remove left-border when monthly donation is checked --- css/donate-style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 6dad54b..ec40033 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -165,6 +165,9 @@ html { .right{ border-left-width: 0px !important; } +.left{ + border-right-width: 0px !important; +} .choiceLabel{ cursor: pointer !important; margin: 0px !important;

1 0

[webwml/staging] add other ways to danate section to the bottom of the main donate page
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit d30a384850b7ad76535521a252c83b0dc01c823b Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 15:29:50 2015 +0800 add other ways to danate section to the bottom of the main donate page --- donate/en/donate.wml | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 44d6432..02140ba 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -113,6 +113,174 @@ </div> </div> </div> + + <div id="other-ways-section"> + <div class="container-fluid"> + <div id="maincol"> + <div class="hundred toptwenty"> + + <div class="row-eqheight"> + +  + <div class="col-sm-6 bitcoin"> + <a id="bitcoin"></a> + <h3><strong>Bitcoins</strong></h3> + <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day. + If you wish to avoid transaction limits, please consider a direct Bitcoin donation to + <a href="https://www.torservers.net/donate.html#cryptocurrencies">Torservers.net</a>, + <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, + <a href="https://www.oniontip.com/">OnionTip</a>, + or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a>. + </p> + <p>If this transaction limit is not an issue for you, please complete the form below:</p> + <form id="bitpayDonation" class="form" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#bitpayDonation'));"> + <input name="action" type="hidden" value="checkout"> + <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> + <div class="form-group"> + <label for="bitcoinEmail" class="input-group control-label" style="padding:0;">Email address</label> + <input id="bitcoinEmail" name="orderID" type="email" class="form-control" placeholder="Email address (optional)" maxlength="50" autocapitalize="off" autocorrect="off"> + </div> + + <div class="form-group row"> + <label for="bitcoinAmount" class="input-group control-label">Amount</label> + <div class="col-sm-8" style="padding:0;"> + <input name="price" type="number" class="form-control" id="bitcoinAmount" value="43.00" placeholder="Amount" maxlength="10" min="5"> + </div> + + <div class="col-sm-4" style="padding:0;"> + <select name="currency" value="" class="form-control"> + <option value="USD" selected="selected">USD</option> + <option value="BTC">BTC</option> + <option value="EUR">EUR</option> + <option value="GBP">GBP</option> + <option value="AUD">AUD</option> + <option value="BGN">BGN</option> + <option value="BRL">BRL</option> + <option value="CAD">CAD</option> + <option value="CHF">CHF</option> + <option value="CNY">CNY</option> + <option value="CZK">CZK</option> + <option value="DKK">DKK</option> + <option value="HKD">HKD</option> + <option value="HRK">HRK</option> + <option value="HUF">HUF</option> + <option value="IDR">IDR</option> + <option value="ILS">ILS</option> + <option value="INR">INR</option> + <option value="JPY">JPY</option> + <option value="KRW">KRW</option> + <option value="LTL">LTL</option> + <option value="LVL">LVL</option> + <option value="MXN">MXN</option> + <option value="MYR">MYR</option> + <option value="NOK">NOK</option> + <option value="NZD">NZD</option> + <option value="PHP">PHP</option> + <option value="PLN">PLN</option> + <option value="RON">RON</option> + <option value="RUB">RUB</option> + <option value="SEK">SEK</option> + <option value="SGD">SGD</option> + <option value="THB">THB</option> + <option value="TRY">TRY</option> + <option value="ZAR">ZAR</option> + </select> + </div> + + </div> + <br> + <input type="hidden" name="data" value="iH+sCoKQo5J52hkEzWcMi8+PRt78/89lcSU9GnapWfWL6thyubtDCahTUqa2JTlj6RQrQySkZAoFvK05yifMwfx5V87JJuoaDlHUsZR9ppzkklmzHpKJ4TG5M0zNVcKfNBfyopdfTFbzpOXM2FDppqmU7njsRUF1EZPa0K7SIxpv4lNKSPn1PyjVKVxjnpFE0AZ1Qa75VwZnS+rBNNfwxPsgSz+Oa2Twe226FmJJrLtPuBteFfHAIWh6QS5JnpOn4ScMFph0zjixutmunMAjKw=="> + <div style="margin: auto; width: 100%; text-align: center"> + <input name="submit" src="https://www.torproject.org/images/bitpay-donate-md.png" type="image" style="width: auto" alt="BitPay" border="0"> + </div> + </fieldset> + </form> + </div> +  + + + + + + <div class="col-sm-6 check-eutransfer"> + +  + <a id="cash"></a> + <h4><strong>Check or Money Order</strong></h4> + <p>You can send checks or money orders to:</p> + <p>The Tor Project, Inc<br> + 7 Temple Street, Suite A<br> + Cambridge, MA 02139-2403 USA + </p> +  + +  + <a id="eubanks"></a> + <h4 style="margin-top:20px;"><strong>European Bank Transfer</strong></h4> + <p>For European bank transfers, we have an arrangement with + the Renewable Freedom Foundation to provide + <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> + donations for Europeans. (They don't actually pass the money + through to us, but rather we trust them to spend it in Tor's + interest.) They will issue a donation receipt <a + href="https://renewablefreedom.org/contact/">upon request</a>. The + account information is as follows: + </p> + <p>Renewable Freedom Foundation<br> + IBAN: DE17721500000053693701<br> + BIC: BYLADEM1ING<br> + Sparkasse Ingolstadt<br> + Rathausplatz 6<br> + 85049 Ingolstadt<br> + </p> +  + + </div> + + </div> + + + <div class="col-sm-12 even-more"> + + <div class="dsmall col-sm-4"> + <a href="../donate/donate-amazon.html.en"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon.jpg"> + </a> + </div> + + <div class="dsmall col-sm-4"> + <a href="https://smile.amazon.com/ch/20-8096820"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon-smile.jpg"> + </a> + </div> + + <div class="dsmall col-sm-4"> + <a id="dwolla"></a> + <a href="https://smile.amazon.com/ch/20-8096820"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/dwolla.jpg"> + </a> + </div> + </div> + + </div>  + </div>  + </div>  + + </div> + + <div class="get-in-touch"> + <div class="container"> + <div class="row"> + <div class="col-xs-4"> + <h3 class="title"><strong>Get in touch.</strong></h3> + </div> + <div class="col-xs-8"> + <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> + </div> + </div> + </div> + </div> + </div>

1 0

[webwml/staging] add amazon and dwolla icon to images directory
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit d9d7af59e698412ed4d964c483bdb4bc10890ca1 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 15:44:32 2015 +0800 add amazon and dwolla icon to images directory --- donate/en/donate.wml | 6 +++--- images/amazon-smile.jpg | Bin 0 -> 34854 bytes images/amazon.jpg | Bin 0 -> 36076 bytes images/dwolla.jpg | Bin 0 -> 34497 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 02140ba..e9225dd 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -244,20 +244,20 @@ <div class="dsmall col-sm-4"> <a href="../donate/donate-amazon.html.en"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon.jpg"> </a> </div> <div class="dsmall col-sm-4"> <a href="https://smile.amazon.com/ch/20-8096820"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon-smile.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon-smile.jpg"> </a> </div> <div class="dsmall col-sm-4"> <a id="dwolla"></a> <a href="https://smile.amazon.com/ch/20-8096820"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/dwolla.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/dwolla.jpg"> </a> </div> </div> diff --git a/images/amazon-smile.jpg b/images/amazon-smile.jpg new file mode 100644 index 0000000..3e188dd Binary files /dev/null and b/images/amazon-smile.jpg differ diff --git a/images/amazon.jpg b/images/amazon.jpg new file mode 100644 index 0000000..d954448 Binary files /dev/null and b/images/amazon.jpg differ diff --git a/images/dwolla.jpg b/images/dwolla.jpg new file mode 100644 index 0000000..b64bbf3 Binary files /dev/null and b/images/dwolla.jpg differ

1 0

[webwml/staging] change colors to more harmonic ones
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 473a6246bc5650dcdf6eb9782ec3ca04020af6ac Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:51:57 2015 +0800 change colors to more harmonic ones --- css/donate-style.css | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index ec40033..8fefc53 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -44,7 +44,7 @@ a { color: #875ca4; } a:hover, a:focus { - color: #663987; + color: #67467D; text-decoration: none; } .btn-primary:hover { @@ -69,8 +69,8 @@ a:hover, a:focus { .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus{ - background-color: #663987; - border-color: #663987; + background-color: #67467D; + border-color: #67467D; } .navbar-brand { height: auto; @@ -113,8 +113,8 @@ float: left; } .img-thumbnail { padding: 1px; - background-color: #794d9a; - border: 1px solid #794d9a; + background-color: #785291; + border: 1px solid #785291; -webkit-transition: none; -o-transition: none; transition: none; @@ -139,7 +139,7 @@ html { } .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; - border-bottom: 3px solid #794d9a; + border-bottom: 3px solid #785291; } .donate-section{ margin-top: 50px; @@ -195,7 +195,7 @@ input[type=number] { display: none; } .quote-section{ - background-color:#663987; + background-color:#67467D; padding: 20px 0; } .champion{ @@ -212,7 +212,7 @@ blockquote { margin: 20px 0 0 0; position: relative; font-size: 20px; - border-left: 5px solid #794d9a; + border-left: 5px solid #785291; color: #ffffff; } blockquote::before { @@ -237,24 +237,16 @@ footer.footer{ background-color: #f5f5f5; } .donate-button { - background-color: #5CA462; - border-color: #47A24E; -} -.donate-button:hover{ - background-color: #2F8E38; - border-color: #47A24E; -} -.donate-button:focus{ - background-color: #2F8E38; - border-color: #47A24E; -} -.donate-button:active{ - background-color: #2F8E38; - border-color: #47A24E; -} -.donate-button:active:hover{ - background-color: #2F8E38; - border-color: #47A24E; + background-color: #4FAB76; + border-color: #47996A; +} +.donate-button:hover, +.donate-button:focus, +.donate-button:active, +.donate-button:active:hover, +.donate-button:active:focus{ + background-color: #47996A; + border-color: #47996A; } @media (max-width: 991px) { blockquote {

1 0

[webwml/staging] add the style of other ways to danate section
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 3133808c1c642490d6fc07edafdd45ff870d9910 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 15:35:29 2015 +0800 add the style of other ways to danate section --- css/donate-style.css | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 8fefc53..7ee5509 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -225,6 +225,84 @@ blockquote::before { blockquote footer{ color: rgb(240,240,240); } +.donate-button { + background-color: #4FAB76; + border-color: #47996A; +} +.donate-button:hover, +.donate-button:focus, +.donate-button:active, +.donate-button:active:hover, +.donate-button:active:focus{ + background-color: #47996A; + border-color: #47996A; +} +#other-ways-section > .container-fluid{ + padding: 0; +} +.hundred.toptwenty{ + text-align: justify; + margin-top: 0; +} +.row-eqheight{ + overflow: hidden; + padding-bottom: 20px +} +.row-eqheight > [class*="col-"]{ + margin-bottom: -99999px; + padding-bottom: 99999px; +} +.bitcoin{ + padding-top: 10px; + padding-left: 30px; + padding-right: 30px; + background-color: #F6F6F6; +} +#bitpayDonation > .well > .form-group { + margin-right: 0; + margin-left: 0; +} +#bitpayDonation > .well { + box-shadow: none; + border-radius: 7px; + margin-bottom: 0; +} +.check-eutransfer{ + padding-top: 20px; + padding-left: 30px; + padding-right: 30px; + background-color: #F0F0F0; +} +.even-more{ + padding: 25px 0; + background-color: #FAFAFA; +} +.dsmall{ + padding: 0 100px; +} +.other-ways-img{ + width: 100%; +} +.img-thumbnail.other-ways-img { + padding: 1px; + transition: none 0s ease 0s; + border: 2px solid rgb(221, 221, 221); +} +.get-in-touch{ + background-color: #35734F; + color: #fff; +} +.title { + min-height: 80px; + margin-top: 20px; + margin-bottom: 20px; + border-right: 3px solid #3D855B; + padding-top: 25px; +} +.detail { + margin-bottom: 0px; + margin-top: 50px; +} footer.footer{ margin-top: 20px; position: absolute;

1 0

[webwml/staging] add champion class
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 88255555c1197c14c2f18b7a495038b39a14a4b9 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 16:44:08 2015 +0800 add champion class add champion class to avoid changes on all images that have img-thumbnail class --- css/donate-style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/donate-style.css b/css/donate-style.css index 34d771a..40bbf76 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -111,7 +111,7 @@ float: left; .navbar-nav{ margin: 0; } -.img-thumbnail { +.img-thumbnail.champion { padding: 1px; background-color: #785291; border: 1px solid #785291;

1 0

[webwml/staging] make bitcoin background-color to a bit darker color
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 43f96d98b40ec4666435299a2923f1217c6b384c Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 18:05:40 2015 +0800 make bitcoin background-color to a bit darker color --- css/donate-style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/donate-style.css b/css/donate-style.css index ce8e43f..ce99bfd 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -256,7 +256,7 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; - background-color: #F6F6F6; + background-color: #F5F5F5; } #bitpayDonation > .well > .form-group { margin-right: 0;

1 0

[webwml/staging] remove blockquote margin-top
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 64a79781412b5aa16a20b6ec24668003ea8b0e36 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 19:52:18 2015 +0800 remove blockquote margin-top remove blockquote margin-top in order to make better quote section looking on smaller devices --- css/donate-style.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index ce99bfd..f080dac 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -313,12 +313,9 @@ footer.footer{ } @media (max-width: 991px) { blockquote { - margin: 30px 0 0 0; + margin: 5px 0 0 0; font-size: 18px; } - .champion{ - width: 140px; - } .source-quote{ margin-top: 20px; } @@ -328,7 +325,7 @@ footer.footer{ font-size: 28px; } blockquote { - margin: 2% 0 0 0; + margin: 0; font-size: 16px; border: none; }

1 0

[webwml/staging] fix footer position
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 91fa3c89223c838ff281b1e69d390e77aea44034 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 16:10:31 2015 +0800 fix footer position change it from sticky footer to the normal one. remove the margin-bottom of donation section in order to remove the space between get-in-touch and footer. --- css/donate-style.css | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 7ee5509..34d771a 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -132,7 +132,6 @@ html { } .donation{ text-align: center; - margin-bottom: 125px; } .main-text{ margin-top: 50px; @@ -304,9 +303,6 @@ blockquote footer{ margin-top: 50px; } footer.footer{ - margin-top: 20px; - position: absolute; - bottom: 0; width: 100%; /* Set the height of the footer here */ /*height: 65px;*/ @@ -314,18 +310,6 @@ footer.footer{ padding-bottom: 10px; background-color: #f5f5f5; } -.donate-button { - background-color: #4FAB76; - border-color: #47996A; -} -.donate-button:hover, -.donate-button:focus, -.donate-button:active, -.donate-button:active:hover, -.donate-button:active:focus{ - background-color: #47996A; - border-color: #47996A; -} @media (max-width: 991px) { blockquote { margin: 30px 0 0 0; @@ -439,7 +423,6 @@ footer.footer{ width: 35%; } footer.footer { - margin-top: 10px; margin-bottom: 0px; } footer.footer > p {

1 0

[webwml/staging] fix logo's width
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit ea03131faaafc5dec09c05449cee02a95c289646 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 17:34:14 2015 +0800 fix logo's width --- css/donate-style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/donate-style.css b/css/donate-style.css index b5ccaf5..ce8e43f 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -129,6 +129,7 @@ html { } .logo{ height: 81px; + width: auto; } .donation{ text-align: center;

1 0