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

[webwml/staging] fix other amount input
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit c25b5d99b247bb4432ec6f7791a7707e0172822f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:21:17 2015 +0800 fix other amount input prevent default button to be activated when clicking on other amount input for several times --- 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 791f4cd..44d6432 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -124,7 +124,7 @@ var amount = $( this ).filter(".amnt-btn").val(); if (amount == null) { amount = $("#exampleInputAmount").val(); - if ($('#amount').val() == "") { + if ($('#amount').val() == "" && !($("#exampleInputAmount").hasClass("active")) ) { amount = 23 $( "#amount23" ).addClass('active'); } else if (this.id == "exampleInputAmount") {

1 0

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

26 Dec '15

commit f8882d8916bb0063755ea446b447fef6c98221c7 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] remove the box-shadow of other amount input
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit c8781234f91253294ab120b860dd3204899b447c Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:32:02 2015 +0800 remove the box-shadow of other amount input --- css/donate-style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index bc17e98..6dad54b 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -11,6 +11,10 @@ input[type="radio"]:focus, input[type="checkbox"]:focus { outline: none; } +.form-control { + -webkit-box-shadow: none; + box-shadow: none; +} .form-control:focus { border-color: #875ca4; outline: 0;

1 0

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

26 Dec '15

commit 6a6d3dd35a922ba5bc63d4fd60064752cf21b2bb 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 26 Dec '15

26 Dec '15

commit ef6ecd68fa1d263660b8dcc726517ecdce13f49d 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] set logo's height exactly same as navbar's height
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 28f552c7974aa79e01c53d5147e4d9092f0767ff Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 16:50:19 2015 +0800 set logo's height exactly same as navbar's height --- css/donate-style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 40bbf76..b5ccaf5 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -128,7 +128,7 @@ html { margin-top: 28px; } .logo{ - width: 120px; + height: 81px; } .donation{ text-align: center; @@ -377,7 +377,7 @@ footer.footer{ @media (max-width: 399px) { .logo { text-align: center; - width: 25%; + height: 60px; float: none; } .navbar-header{

1 0

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

26 Dec '15

commit 574fd11cdbd13939c09d24a688c652f6817dc44c 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] add amazon and dwolla icon to images directory
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit c3880877009745ad9fc9cf995a1a4ab41456a4e8 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] add champion class
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 5efdbb9bd272871347765f2398cb942020f242f8 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] remove blockquote margin-top
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 2079eecb607b80f729f9e79a7a361646ba50f4c7 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