January 2017 - tor-commits - lists.torproject.org

[webwml/master] change background color of other ways section
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 938e125b2c7307ff4fe0da31e6323a256b0debf6 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:12:02 2015 +0800 change background color of other ways section --- css/donate-style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 6111d03..901eaa6 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -247,6 +247,9 @@ blockquote footer{ #other-ways-section > .container-fluid{ padding: 0; } +.main-other-ways{ + background-color: #f5f5f5; +} .hundred.toptwenty{ text-align: justify; margin-top: 0; @@ -263,7 +266,6 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; - background-color: #F5F5F5; } #bitpayDonation > .well > .form-group { margin-right: 0; @@ -278,7 +280,9 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; - background-color: #F0F0F0; +} +.minor-other-ways{ + background-color: #FAFAFA; } .even-more{ padding: 25px 0;

1 0

[webwml/master] put border between bitcoin and check / eu transfer section
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 5d91aad56ca87bd3f95c2eb0ecf1c19f5e992626 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:23:08 2015 +0800 put border between bitcoin and check / eu transfer section --- css/donate-style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 901eaa6..d4fd12b 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -280,6 +280,7 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; + border-left: 1px dashed #e3e3e3; } .minor-other-ways{ background-color: #FAFAFA; @@ -353,6 +354,10 @@ footer.footer{ #donate > .btn-group { margin-bottom: 15px; } + .check-eutransfer{ + border-left: none; + border-top: 1px dashed #e3e3e3; + } #bitpayDonation > .well { margin-bottom: 30px; }

1 0

[webwml/master] fix other ways section's width
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 06ada809ef5065126152e4f48fe34507a7763f71 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 25 23:55:18 2015 +0800 fix other ways section's width --- donate/en/donate.wml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 9b31aef..044764f 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -114,9 +114,10 @@ </div> </div> - <div id="other-ways-section"> - <div class="container-fluid"> - <div id="maincol"> + <div id="other-ways-section"> + <div class="main-other-ways"> + <div class="container"> + <div id="maincol"> <div class="hundred toptwenty"> <div class="row-eqheight"> @@ -238,8 +239,13 @@ </div> </div> - - + </div>  + </div>  + </div>  + </div>  + + <div class="minor-other-ways"> + <div class="container"> <div class="col-xs-12 even-more"> <div class="dsmall col-xs-4"> @@ -262,9 +268,8 @@ </div> </div> - </div>  - </div>  - </div>  + </div>  + </div>  </div>

1 0

[webwml/master] add icon to titles of other ways section
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 0b71608bdc194dfaa2084558e32e75b18d80f0bc Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 02:46:08 2015 +0800 add icon to titles of other ways section --- css/donate-style.css | 11 +++++++++++ donate/en/donate.wml | 15 ++++++++++++--- images/bank48.png | Bin 0 -> 1719 bytes images/bitcoin.png | Bin 0 -> 2000 bytes images/pantheon1.png | Bin 0 -> 1464 bytes 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 0f5fdfd..cb6908e 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -262,6 +262,17 @@ blockquote footer{ margin-bottom: -99999px; padding-bottom: 99999px; } +.other-ways-title{ + margin: 10px 0; +} +.other-ways-title > h3{ + display: inline; +} +.other-ways-icon{ + background: transparent; + margin-top: -10px; + margin-right: 5px; +} .bitcoin{ padding-top: 10px; padding-left: 30px; diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 044764f..dc6081b 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -125,7 +125,10 @@  <div class="col-sm-6 bitcoin"> <a id="bitcoin"></a> - <h4><strong>Bitcoins</strong></h4> + <div class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/bitcoin.png" width="40" height="40"> + <h3><strong>Bitcoins</strong></h3> + </div> <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>, @@ -207,7 +210,10 @@  <a id="cash"></a> - <h4><strong>Check or Money Order</strong></h4> + <div class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/bank48.png" width="40" height="40"> + <h3><strong>Check or Money Order</strong></h3> + </div> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br> 7 Temple Street, Suite A<br> @@ -217,7 +223,10 @@  <a id="eubanks"></a> - <h4 style="margin-top:20px;"><strong>European Bank Transfer</strong></h4> + <div style="margin-top:30px;" class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/pantheon1.png" width="40" height="40"> + <h3><strong>European Bank Transfer</strong></h3> + </div> <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> diff --git a/images/bank48.png b/images/bank48.png new file mode 100644 index 0000000..b488403 Binary files /dev/null and b/images/bank48.png differ diff --git a/images/bitcoin.png b/images/bitcoin.png new file mode 100644 index 0000000..497e514 Binary files /dev/null and b/images/bitcoin.png differ diff --git a/images/pantheon1.png b/images/pantheon1.png new file mode 100644 index 0000000..361a233 Binary files /dev/null and b/images/pantheon1.png differ

1 0

[webwml/master] fix other ways to donate link functionality
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 7d62660e6672a51e6dffe58130696dea2f169a85 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 13:21:35 2015 +0800 fix other ways to donate link functionality scroll down the page to other ways donate section if click on other ways to donate link --- donate/en/donate.wml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 06d8289..490f1a3 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -91,7 +91,7 @@ <h5 class="error-msg">The minimum donation amount is $5</h5> <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button> <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> + <h4><a id="link" href="#other-ways-section">Other Ways to Donate</a></h4> </div>  @@ -370,6 +370,14 @@ $(".left").removeClass('active'); }); + + $("#link").on('click',function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $("#other-ways-section").offset().top + }, 200); + }); + });

1 0

[webwml/master] make bitcoins title h4 instead of h3
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 1c13fb0b175bd9c567148679079116cdf7eacc4d Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 25 23:11:17 2015 +0800 make bitcoins title h4 instead of h3 --- donate/en/donate.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 6a67061..9b31aef 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -124,7 +124,7 @@  <div class="col-sm-6 bitcoin"> <a id="bitcoin"></a> - <h3><strong>Bitcoins</strong></h3> + <h4><strong>Bitcoins</strong></h4> <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>,

1 0

[webwml/master] set max-width for dwolla and amazon icons
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 9b8e3051b3c7bb9d796d80e3a4bab778b631d85d Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:36:25 2015 +0800 set max-width for dwolla and amazon icons --- css/donate-style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index d4fd12b..0f5fdfd 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -289,11 +289,9 @@ blockquote footer{ padding: 25px 0; background-color: #FAFAFA; } -.dsmall{ - padding: 0 8%; -} .other-ways-img{ width: 100%; + max-width: 160px; } .img-thumbnail.other-ways-img { padding: 1px;

1 0

[webwml/master] hide other ways to donate section by default
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 282dfb62b47644f35c4192f27a333f085ae8aa22 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 25 23:05:45 2015 +0800 hide other ways to donate section by default --- css/donate-style.css | 3 +++ donate/en/donate.wml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 8e1532f..8db9989 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -241,6 +241,9 @@ blockquote footer{ background-color: #47996A; border-color: #47996A; } +#other-ways-section{ + display: none; +} #other-ways-section > .container-fluid{ padding: 0; } diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 4781579..6a67061 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -373,11 +373,13 @@ $("#link").on('click',function(event){ event.preventDefault(); + $("#other-ways-section").show(); $('html, body').animate({ scrollTop: $("#other-ways-section").offset().top }, 200); }); + });

1 0

[webwml/master] get rid of the 'get-intouch' section on donate page
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit a01d1bcb53f2f094c267a70ab126404a70f4cca5 Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Dec 26 06:39:34 2015 +0000 get rid of the 'get-intouch' section on donate page --- donate/en/donate.wml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index dc6081b..28ab1da 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -281,20 +281,6 @@ </div>  </div> - - <div class="get-in-touch"> - <div class="container"> - <div class="row"> - <div class="col-sm-4"> - <h3 class="title"><strong>Get in touch.</strong></h3> - </div> - <div class="col-sm-8"> - <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> - </div> - </div> - </div> - </div> - </div>

1 0

[webwml/master] reduce top margin of check or money order header
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit ce3340a290bd2b99d59633b108710e322a35765f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:00:36 2015 +0800 reduce top margin of check or money order header --- 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 8db9989..6111d03 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -275,7 +275,7 @@ blockquote footer{ margin-bottom: 0; } .check-eutransfer{ - padding-top: 20px; + padding-top: 10px; padding-left: 30px; padding-right: 30px; background-color: #F0F0F0;

1 0