July 2020 - tor-commits - lists.torproject.org

[tpo/staging] Add background and highlights
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 6e6112d6deb03f1cf0cb3b152002a7b0b725bd58 Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:21:33 2020 -0300 Add background and highlights --- assets/static/images/membership/header.png | Bin 0 -> 334841 bytes templates/membership.html | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/static/images/membership/header.png b/assets/static/images/membership/header.png new file mode 100644 index 00000000..08917a7e Binary files /dev/null and b/assets/static/images/membership/header.png differ diff --git a/templates/membership.html b/templates/membership.html index c1d0982c..9aa1b949 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -1,7 +1,7 @@ <div class="container py-3"> <h3 class="text-primary display-5">Show your support for privacy online</h3> <p>When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. - If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.</p> + If you are interested in becoming a member, please reach out to us at <mark>giving(a)torproject.org.</mark></p> </div> <div class="container py-3"> <h3 class="text-primary display-5">Membership Tiers</h3> @@ -145,7 +145,9 @@ </div> </div> </div> -<div class="row col-sm-8 py-5 text-center mx-auto bg-membership" style="background-image:url('static/images/membership/shallot.png')"/> +<div class="col-12 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> +<div class="row col-sm-8 py-5 text-center mx-auto"/> <h2 class="text-primary text-center mx-auto">Become a Member</h2> - <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> + <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> +</div> </div>

1 0

[tpo/staging] Make text visible with background
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit fdcce1809b17c184eac2fd58b58bda841f8699bf Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:37:22 2020 -0300 Make text visible with background --- templates/membership.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index f703df29..8c3efaec 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -127,7 +127,7 @@ </div> <div class="col-12 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> <div class="row col-sm-8 py-5 text-center mx-auto"/> - <h2 class="text-primary text-center mx-auto">Become a Member</h2> - <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> + <h2 class="bg-white text-primary text-center p-4 mx-auto my-0">Become a Member</h2> + <p class="bg-white text-center p-4">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> </div> </div>

1 0

[tpo/staging] - Add Members
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit c4da4e58b959f73e054bf2240433e1f146062d36 Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:35:59 2020 -0300 - Add Members - Add anchor links --- assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 78 +++++++++++++++++++++ templates/membership.html | 42 +++-------- 3 files changed, 89 insertions(+), 31 deletions(-) diff --git a/assets/static/images/membership/logos/Avast.png b/assets/static/images/membership/logos/Avast.png new file mode 100755 index 00000000..d09b8bd5 Binary files /dev/null and b/assets/static/images/membership/logos/Avast.png differ diff --git a/assets/static/images/membership/logos/MullvadVPN.svg b/assets/static/images/membership/logos/MullvadVPN.svg new file mode 100644 index 00000000..94262ea9 --- /dev/null +++ b/assets/static/images/membership/logos/MullvadVPN.svg @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" id="Mullvad_VPN_Logo_Positive" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + x="0px" y="0px" viewBox="0 0 1405.7 575.4" style="enable-background:new 0 0 1405.7 575.4;" xml:space="preserve"> +<style type="text/css"> + .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} + .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} + .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} + .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} + .st4{fill:#FFFFFF;} + .st5{fill:#1D2A3A;} + .st6{fill:#192E45;} +</style> +<g id="Logo"> + <path id="bg" class="st0" d="M566.2,200c0,69.8,56.6,126.3,126.3,126.3S818.9,269.8,818.9,200S762.3,73.7,692.5,73.7 + S566.2,130.2,566.2,200L566.2,200L566.2,200L566.2,200z"/> + <path id="Mullvad_Fur" class="st1" d="M583.1,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 + c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 + c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 + c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 + c1-0.7,2.1-1.3,3.2-2l1-0.6l0.5,0.3l7.2,4.8l-7.3-1.9c-0.7,0.8-1.4,1.6-2.2,2.4c-0.9,0.9-1.9,1.8-2.8,2.7c-1,0.8-2,1.7-3.1,2.4 + c-1.1,0.8-2.1,1.5-3.3,2.2c-2.2,1.4-4.6,2.6-7.1,3.6c-1.2,0.5-2.5,1-3.7,1.4c-1.3,0.4-2.5,0.8-3.8,1.1c-1.3,0.3-2.6,0.6-3.9,0.8 + c-1.3,0.2-2.6,0.3-3.9,0.5c-2.6,0.1-5.3,0.1-7.9-0.3c-1.3-0.2-2.6-0.4-3.9-0.7c-1.3-0.3-2.5-0.7-3.7-1.1c-2.1-0.8-4.2-1.8-6.1-3 + c0,0-6.9,1-4.1,6.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5c-4.6,6.2-11.8,11.7-11.1,15c32.7,40.3,106.4,34.7,134.4-1.3 + c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 + l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 + c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 + l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L583.1,184.9L583.1,184.9L583.1,184.9L583.1,184.9 + z"/> + <path id="Mullvad_Nose" class="st2" d="M594.8,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 + c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C596.4,157.1,595.8,155.7,594.8,154.5L594.8,154.5L594.8,154.5L594.8,154.5z"/> + <path id="Mullvad_Helmet" class="st3" d="M667.6,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 + c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 + c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L638.8,144c-0.4-0.2-0.8-0.4-1.1-0.6 + C642.3,143.4,659.8,145.5,667.6,143.8"/> + <g id="Helmet_Lamp"> + <path class="st4" d="M677.1,147.4c-0.9,0-1.6-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.6,7.3-9.7,11.5-9.7 + c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C686.2,143.3,681.3,147.4,677.1,147.4z"/> + <g> + <path class="st5" d="M683.6,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 + c-2.2,5.1-6.5,8.8-10.1,8.8c-0.6,0-1.2-0.1-1.7-0.3l0,0l0,0c-1.5-0.6-2.3-2-2.7-3.1c-1.2-3-0.9-7.4,0.8-11.4 + C675.7,126,680,122.3,683.6,122.3 M683.6,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 + c0.9,0.4,1.9,0.6,3,0.6c4.8,0,10.1-4.4,12.8-10.7c1.7-3.8,2.2-7.8,1.6-11.3c-0.6-3.5-2.4-6-5-7.1 + C685.6,119.5,684.6,119.3,683.6,119.3L683.6,119.3z"/> + </g> + </g> +</g> +<g> + <path class="st6" d="M212.8,369.7c0-0.9,0.6-1.5,1.5-1.5h17.8c1.2,0,2,0.4,2.4,1.5l25.8,58.2h0.6l25.3-58.2c0.4-1,1.2-1.5,2.4-1.5 + h17.5c0.9,0,1.5,0.6,1.5,1.5v99c0,0.9-0.6,1.5-1.5,1.5h-17c-0.9,0-1.5-0.6-1.5-1.5v-57.4h-0.6l-18.9,43c-0.6,1.4-1.5,2-2.8,2h-10.3 + c-1.3,0-2.2-0.6-2.8-2l-18.9-43h-0.6v57.4c0,0.9-0.6,1.5-1.5,1.5h-16.9c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> + <path class="st6" d="M329.8,432.7v-63c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v63.6c0,12.1,6.8,19,17.1,19 + c10.2,0,16.9-6.9,16.9-19v-63.6c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v63c0,25.3-16.2,39.1-39,39.1 + C346,471.9,329.8,458.1,329.8,432.7z"/> + <path class="st6" d="M430,369.7c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v79.9c0,0.6,0.3,0.9,0.9,0.9h45 + c0.9,0,1.5,0.6,1.5,1.5v16.6c0,0.9-0.6,1.5-1.5,1.5h-66.4c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> + <path class="st6" d="M515.5,369.7c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v79.9c0,0.6,0.3,0.9,0.9,0.9h45 + c0.9,0,1.5,0.6,1.5,1.5v16.6c0,0.9-0.6,1.5-1.5,1.5H517c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> + <path class="st6" d="M616.4,470.2c-1,0-1.6-0.6-1.9-1.5l-32.4-98.8c-0.3-1.1,0.3-1.6,1.3-1.6h19.5c1,0,1.7,0.4,2,1.5l20.4,66.9h0.4 + l19.8-66.9c0.3-1,0.9-1.5,1.9-1.5h19.3c0.9,0,1.5,0.6,1.2,1.6l-32.4,98.8c-0.3,0.9-0.9,1.5-1.8,1.5H616.4z"/> + <path class="st6" d="M703.9,369.7c0.3-0.9,0.9-1.5,2-1.5h18.9c1,0,1.6,0.6,1.9,1.5l34.5,99c0.3,0.9,0,1.5-1,1.5h-19.5 + c-1,0-1.7-0.5-2-1.5l-5.8-17.8h-35.7l-5.7,17.8c-0.3,1-0.9,1.5-2,1.5h-19.6c-1,0-1.3-0.6-1-1.5L703.9,369.7z M726.8,432.1 + l-11.5-35.7h-0.4l-11.5,35.7H726.8z"/> + <path class="st6" d="M776,369.7c0-0.9,0.6-1.5,1.5-1.5h37.9c17.8,0,30.3,7.6,35.2,22.9c1.8,5.7,2.7,11.4,2.7,28s-0.9,22.3-2.7,28 + c-4.9,15.3-17.4,22.9-35.2,22.9h-37.9c-0.9,0-1.5-0.6-1.5-1.5V369.7z M799,450.6h11.5c10.2,0,16.3-3,18.9-11.2 + c1-3,1.7-6.9,1.7-20.1c0-13.2-0.6-17.1-1.7-20.1c-2.5-8.2-8.7-11.2-18.9-11.2H799c-0.6,0-0.9,0.3-0.9,0.9v60.9 + C798.1,450.3,798.4,450.6,799,450.6z"/> + <path class="st6" d="M933.8,470.2c-1.1,0-1.7-0.6-2-1.5l-32.4-98.8c-0.3-1.1,0.3-1.6,1.3-1.6h19.5c1,0,1.7,0.4,2,1.5l20.4,66.9h0.4 + l19.8-66.9c0.3-1,0.9-1.5,1.9-1.5h19.3c0.9,0,1.5,0.6,1.2,1.6L953,468.7c-0.3,0.9-0.9,1.5-1.8,1.5H933.8z"/> + <path class="st6" d="M1001.3,470.2c-0.9,0-1.5-0.6-1.5-1.5v-99c0-0.9,0.6-1.5,1.5-1.5h39.6c22.2,0,35.5,13.3,35.5,32.8 + c0,19.2-13.5,32.7-35.5,32.7h-18.1c-0.6,0-0.9,0.3-0.9,0.9v34c0,0.9-0.6,1.5-1.5,1.5H1001.3z M1054.4,401.1 + c0-8.2-5.5-13.8-14.8-13.8h-16.8c-0.6,0-0.9,0.3-0.9,0.9v25.6c0,0.6,0.3,0.9,0.9,0.9h16.8C1048.9,414.7,1054.4,409.3,1054.4,401.1z + "/> + <path class="st6" d="M1093.6,369.7c0-0.9,0.6-1.5,1.5-1.5h18c1,0,2,0.4,2.5,1.5l36,64.2h0.8v-64.2c0-0.9,0.6-1.5,1.5-1.5h16.9 + c0.9,0,1.5,0.6,1.5,1.5v99c0,0.9-0.6,1.5-1.5,1.5H1153c-1.2,0-2-0.5-2.5-1.5l-36.1-64h-0.8v64c0,0.9-0.6,1.5-1.5,1.5h-16.9 + c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> +</g> +</svg> diff --git a/templates/membership.html b/templates/membership.html index 9aa1b949..f703df29 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -13,7 +13,7 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">Green Onion Member</h4> + <a class="h2 col-12 text-primary p-0" href="#green">Green Onion Member</a> <p class="nick">$10,000 - $49,999 per year</p> <p>Your organization’s name, linking back to your website, is featured on our Membership Program page.</p> </div> @@ -23,7 +23,7 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/vidalia.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">Vidalia Onion Member</h4> + <a class="h2 col-12 text-primary p-0" href="#vidalia">Vidalia Onion Member</a> <p class="nick">$50,000 - $99,999 per year</p> <p>Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.</p> </div> @@ -33,20 +33,20 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">Shallot Onion Member</h4> + <a class="h2 col-12 text-primary p-0" href="#shallot">Shallot Onion Member</a> <p class="nick">≥ $100,000 per year year</p> <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> </div> </div> </div> -<div class="container"> +<div class="container" id="shallot"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN"> <div class="card-body"> - <h4><a href="#">Shallot Onion Member</a></h4> + <h4><a href="#">Mullvad VPN</a></h4> Some description </div> </div> @@ -71,32 +71,12 @@ </div> </div> </div> -<div class="container"> +<div class="container" id="vidalia"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> - </div> - </div> - <div class="col-md-3 col-xl-3 my-2"> - <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> - </div> - </div> - <div class="col-md-3 col-xl-3 my-2"> - <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> - </div> - </div> - <div class="col-md-3 col-xl-3 my-2"> - <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> - </div> - </div> - <div class="col-md-3 col-xl-3 my-2"> - <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2"> @@ -116,13 +96,13 @@ </div> </div> </div> -<div class="container"> +<div class="container" id="green"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">{{ _('Green Onion Members') }}</h3> <div class="col-md-6"> <ul class="jobs-ul"> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> - <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> + <li><a href="#">Zcash Foundation</a></li> + <li><a href="#">ProtonMail</a></li> <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li> <li><a href="#">Green Onion Members</a> - <span> Green Onion Member</span></li>

1 0

[tpo/staging] Update membership.html
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit f23332cffa8161ce6f08cb29572a586c53a796df Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:42:56 2020 -0300 Update membership.html --- templates/membership.html | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index d1382043..b70fb7e1 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,24 +42,32 @@ <div class="container" id="shallot"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> - <div class="col-md-6 col-xl-6 my-2"> + <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN"> <div class="card-body"> - <p><a href="#">Mullvad VPN</a></p> + <p><a href="#" class="h4">Mullvad VPN</a></p> Mullvad is a VPN service that helps users keep their online activity, identity, and location private. With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective. </div> </div> </div> - <div class="col-md-6 col-xl-6 my-2"> + <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top" src="#" alt=""> <div class="card-body"> - <h4><a href="#">Shallot Onion Member</a></h4> - Some description + <p><a href="#" class="h4"></a></p> </div> </div> </div> + <div class="col-md-4 col-xl-4 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top" src="#" alt=""> + <div class="card-body"> + <p><a href="#" class="h4"></a></p> + </div> + </div> + </div> + </div> </div> <div class="container" id="vidalia"> <div class="row py-5"> @@ -71,17 +79,17 @@ </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top" src="#" alt=""> </div> </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top" src="#" alt=""> </div> </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> + <img class="card-img-top" src="#" alt=""> </div> </div> </div> @@ -115,7 +123,7 @@ </div> </div> </div> -<div class="col-12 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> +<div class="col-12 py-5 bg-membership" style="background-image: url('../../static/images/membership/header.png'); background-size:cover;"> <div class="row col-sm-8 py-5 text-center mx-auto"/> <h2 class="bg-white text-primary text-center p-4 mx-auto my-0">Become a Member</h2> <p class="bg-white text-center p-4">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p>

1 0

[tpo/staging] Improve Shallot view
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit e516b476ba403ed7d1b8d716330028300b32a7c2 Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:39:43 2020 -0300 Improve Shallot view --- .../static/images/membership/logos/MullvadVPN.svg | 225 ++++++++++++++++----- templates/membership.html | 18 +- 2 files changed, 176 insertions(+), 67 deletions(-) diff --git a/assets/static/images/membership/logos/MullvadVPN.svg b/assets/static/images/membership/logos/MullvadVPN.svg index 94262ea9..f58d766d 100644 --- a/assets/static/images/membership/logos/MullvadVPN.svg +++ b/assets/static/images/membership/logos/MullvadVPN.svg @@ -1,20 +1,60 @@ <?xml version="1.0" encoding="utf-8"?>  <svg version="1.1" id="Mullvad_VPN_Logo_Positive" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - x="0px" y="0px" viewBox="0 0 1405.7 575.4" style="enable-background:new 0 0 1405.7 575.4;" xml:space="preserve"> + x="0px" y="0px" viewBox="0 0 400 400" style="enable-background:new 0 0 400 400;" xml:space="preserve"> <style type="text/css"> - .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} - .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} - .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} - .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} - .st4{fill:#FFFFFF;} - .st5{fill:#1D2A3A;} - .st6{fill:#192E45;} + .st0{clip-path:url(#SVGID_1_);} + .st1{clip-path:url(#SVGID_2_);} + .st2{clip-path:url(#SVGID_3_);} + .st3{clip-path:url(#SVGID_4_);fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;} + .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} + .st5{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} + .st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} + .st7{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} + .st8{fill:#FFFFFF;} + .st9{fill:#1D2A3A;} + .st10{fill:#192E45;} </style> <g id="Logo"> - <path id="bg" class="st0" d="M566.2,200c0,69.8,56.6,126.3,126.3,126.3S818.9,269.8,818.9,200S762.3,73.7,692.5,73.7 - S566.2,130.2,566.2,200L566.2,200L566.2,200L566.2,200z"/> - <path id="Mullvad_Fur" class="st1" d="M583.1,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 + <g id="strokes"> + <defs> + <path id="SVGID_61_" d="M309.4,297.7c5.7-6.4,11.2-13.6,16.3-22.1"/> + </defs> + <defs> + <path id="SVGID_60_" d="M74.3,275.6c5.1,8.5,10.6,15.7,16.2,22"/> + </defs> + <defs> + <path id="SVGID_59_" d="M53.5,203.2c0.1,6.7,0.7,13.4,1.8,20l0,0l0,0l0,0c3.1,19.1,9.7,36.8,19.1,52.4"/> + </defs> + <defs> + <path id="SVGID_58_" d="M325.7,275.6c12.8-21.3,20.6-45.6,21-72.3"/> + </defs> + <clipPath id="SVGID_1_"> + <use xlink:href="#SVGID_61_" style="overflow:visible;"/> + </clipPath> + <clipPath id="SVGID_2_" class="st0"> + <use xlink:href="#SVGID_60_" style="overflow:visible;"/> + </clipPath> + <clipPath id="SVGID_3_" class="st1"> + <use xlink:href="#SVGID_59_" style="overflow:visible;"/> + </clipPath> + <clipPath id="SVGID_4_" class="st2"> + <use xlink:href="#SVGID_58_" style="overflow:visible;"/> + </clipPath> + <path class="st3" d="M166.2,52l19.7-3.2C263,36.5,335.6,89,348,166.2l3.2,19.7C363.5,263,311,335.6,233.8,348l-19.7,3.2 + C137,363.5,64.4,311,52,233.8l-3.2-19.7C36.5,137,89,64.4,166.2,52z"/> + + <use xlink:href="#SVGID_61_" style="overflow:visible;fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;"/> + + <use xlink:href="#SVGID_60_" style="overflow:visible;fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;"/> + + <use xlink:href="#SVGID_59_" style="overflow:visible;fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;"/> + + <use xlink:href="#SVGID_58_" style="overflow:visible;fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;"/> + </g> + <path id="bg" class="st4" d="M73.7,200c0,69.8,56.6,126.3,126.3,126.3S326.3,269.8,326.3,200S269.8,73.7,200,73.7 + S73.7,130.2,73.7,200L73.7,200L73.7,200L73.7,200z"/> + <path id="Mullvad_Fur" class="st5" d="M90.6,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 @@ -25,54 +65,133 @@ c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 - l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L583.1,184.9L583.1,184.9L583.1,184.9L583.1,184.9 - z"/> - <path id="Mullvad_Nose" class="st2" d="M594.8,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 - c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C596.4,157.1,595.8,155.7,594.8,154.5L594.8,154.5L594.8,154.5L594.8,154.5z"/> - <path id="Mullvad_Helmet" class="st3" d="M667.6,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 + l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L90.6,184.9L90.6,184.9L90.6,184.9L90.6,184.9z"/> + <path id="Mullvad_Nose" class="st6" d="M102.2,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 + c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C103.9,157.1,103.2,155.7,102.2,154.5L102.2,154.5L102.2,154.5L102.2,154.5z"/> + <path id="Mullvad_Helmet" class="st7" d="M175.1,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 - c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L638.8,144c-0.4-0.2-0.8-0.4-1.1-0.6 - C642.3,143.4,659.8,145.5,667.6,143.8"/> + c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L146.3,144c-0.4-0.2-0.8-0.4-1.1-0.6 + C149.8,143.4,167.3,145.5,175.1,143.8"/> <g id="Helmet_Lamp"> - <path class="st4" d="M677.1,147.4c-0.9,0-1.6-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.6,7.3-9.7,11.5-9.7 - c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C686.2,143.3,681.3,147.4,677.1,147.4z"/> + <path class="st8" d="M184.6,147.4c-0.9,0-1.7-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.7,7.2-9.7,11.5-9.7 + c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C193.6,143.3,188.8,147.4,184.6,147.4z"/> <g> - <path class="st5" d="M683.6,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 + <path class="st9" d="M191,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 c-2.2,5.1-6.5,8.8-10.1,8.8c-0.6,0-1.2-0.1-1.7-0.3l0,0l0,0c-1.5-0.6-2.3-2-2.7-3.1c-1.2-3-0.9-7.4,0.8-11.4 - C675.7,126,680,122.3,683.6,122.3 M683.6,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 + C183.2,126,187.4,122.3,191,122.3 M191,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 c0.9,0.4,1.9,0.6,3,0.6c4.8,0,10.1-4.4,12.8-10.7c1.7-3.8,2.2-7.8,1.6-11.3c-0.6-3.5-2.4-6-5-7.1 - C685.6,119.5,684.6,119.3,683.6,119.3L683.6,119.3z"/> + C193.1,119.5,192.1,119.3,191,119.3L191,119.3z"/> </g> </g> -</g> -<g> - <path class="st6" d="M212.8,369.7c0-0.9,0.6-1.5,1.5-1.5h17.8c1.2,0,2,0.4,2.4,1.5l25.8,58.2h0.6l25.3-58.2c0.4-1,1.2-1.5,2.4-1.5 - h17.5c0.9,0,1.5,0.6,1.5,1.5v99c0,0.9-0.6,1.5-1.5,1.5h-17c-0.9,0-1.5-0.6-1.5-1.5v-57.4h-0.6l-18.9,43c-0.6,1.4-1.5,2-2.8,2h-10.3 - c-1.3,0-2.2-0.6-2.8-2l-18.9-43h-0.6v57.4c0,0.9-0.6,1.5-1.5,1.5h-16.9c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> - <path class="st6" d="M329.8,432.7v-63c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v63.6c0,12.1,6.8,19,17.1,19 - c10.2,0,16.9-6.9,16.9-19v-63.6c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v63c0,25.3-16.2,39.1-39,39.1 - C346,471.9,329.8,458.1,329.8,432.7z"/> - <path class="st6" d="M430,369.7c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v79.9c0,0.6,0.3,0.9,0.9,0.9h45 - c0.9,0,1.5,0.6,1.5,1.5v16.6c0,0.9-0.6,1.5-1.5,1.5h-66.4c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> - <path class="st6" d="M515.5,369.7c0-0.9,0.6-1.5,1.5-1.5h19c0.9,0,1.5,0.6,1.5,1.5v79.9c0,0.6,0.3,0.9,0.9,0.9h45 - c0.9,0,1.5,0.6,1.5,1.5v16.6c0,0.9-0.6,1.5-1.5,1.5H517c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> - <path class="st6" d="M616.4,470.2c-1,0-1.6-0.6-1.9-1.5l-32.4-98.8c-0.3-1.1,0.3-1.6,1.3-1.6h19.5c1,0,1.7,0.4,2,1.5l20.4,66.9h0.4 - l19.8-66.9c0.3-1,0.9-1.5,1.9-1.5h19.3c0.9,0,1.5,0.6,1.2,1.6l-32.4,98.8c-0.3,0.9-0.9,1.5-1.8,1.5H616.4z"/> - <path class="st6" d="M703.9,369.7c0.3-0.9,0.9-1.5,2-1.5h18.9c1,0,1.6,0.6,1.9,1.5l34.5,99c0.3,0.9,0,1.5-1,1.5h-19.5 - c-1,0-1.7-0.5-2-1.5l-5.8-17.8h-35.7l-5.7,17.8c-0.3,1-0.9,1.5-2,1.5h-19.6c-1,0-1.3-0.6-1-1.5L703.9,369.7z M726.8,432.1 - l-11.5-35.7h-0.4l-11.5,35.7H726.8z"/> - <path class="st6" d="M776,369.7c0-0.9,0.6-1.5,1.5-1.5h37.9c17.8,0,30.3,7.6,35.2,22.9c1.8,5.7,2.7,11.4,2.7,28s-0.9,22.3-2.7,28 - c-4.9,15.3-17.4,22.9-35.2,22.9h-37.9c-0.9,0-1.5-0.6-1.5-1.5V369.7z M799,450.6h11.5c10.2,0,16.3-3,18.9-11.2 - c1-3,1.7-6.9,1.7-20.1c0-13.2-0.6-17.1-1.7-20.1c-2.5-8.2-8.7-11.2-18.9-11.2H799c-0.6,0-0.9,0.3-0.9,0.9v60.9 - C798.1,450.3,798.4,450.6,799,450.6z"/> - <path class="st6" d="M933.8,470.2c-1.1,0-1.7-0.6-2-1.5l-32.4-98.8c-0.3-1.1,0.3-1.6,1.3-1.6h19.5c1,0,1.7,0.4,2,1.5l20.4,66.9h0.4 - l19.8-66.9c0.3-1,0.9-1.5,1.9-1.5h19.3c0.9,0,1.5,0.6,1.2,1.6L953,468.7c-0.3,0.9-0.9,1.5-1.8,1.5H933.8z"/> - <path class="st6" d="M1001.3,470.2c-0.9,0-1.5-0.6-1.5-1.5v-99c0-0.9,0.6-1.5,1.5-1.5h39.6c22.2,0,35.5,13.3,35.5,32.8 - c0,19.2-13.5,32.7-35.5,32.7h-18.1c-0.6,0-0.9,0.3-0.9,0.9v34c0,0.9-0.6,1.5-1.5,1.5H1001.3z M1054.4,401.1 - c0-8.2-5.5-13.8-14.8-13.8h-16.8c-0.6,0-0.9,0.3-0.9,0.9v25.6c0,0.6,0.3,0.9,0.9,0.9h16.8C1048.9,414.7,1054.4,409.3,1054.4,401.1z - "/> - <path class="st6" d="M1093.6,369.7c0-0.9,0.6-1.5,1.5-1.5h18c1,0,2,0.4,2.5,1.5l36,64.2h0.8v-64.2c0-0.9,0.6-1.5,1.5-1.5h16.9 - c0.9,0,1.5,0.6,1.5,1.5v99c0,0.9-0.6,1.5-1.5,1.5H1153c-1.2,0-2-0.5-2.5-1.5l-36.1-64h-0.8v64c0,0.9-0.6,1.5-1.5,1.5h-16.9 - c-0.9,0-1.5-0.6-1.5-1.5V369.7z"/> + <g id="Privacy_is_a_universal_right"> + <path class="st10" d="M62.6,195.3c0,0.2-0.2,0.3-0.4,0.3l-20.2-3.6c-0.2,0-0.3-0.2-0.3-0.4l1.5-8.1c0.8-4.5,4-6.8,8-6 + c3.9,0.7,6.2,4,5.4,8.5l-0.7,3.7c0,0.1,0,0.2,0.2,0.2l6.9,1.3c0.2,0,0.3,0.2,0.3,0.4L62.6,195.3z M50.5,181.9 + c-1.7-0.3-3,0.6-3.4,2.5l-0.6,3.4c0,0.1,0,0.2,0.2,0.2l5.2,0.9c0.1,0,0.2,0,0.2-0.2l0.6-3.4C53.1,183.6,52.2,182.2,50.5,181.9z"/> + <path class="st10" d="M67.5,165.5c-0.1,0.3-0.2,0.3-0.4,0.4l-8.4,1.8l-0.6,2.8c0,0.1,0,0.2,0.1,0.2l7.4,1.7c0.2,0,0.3,0.2,0.2,0.4 + l-0.9,3.9c0,0.2-0.2,0.3-0.4,0.2l-20-4.6c-0.2,0-0.3-0.2-0.2-0.4l1.9-8.2c1-4.2,4.2-6.4,8-5.5c2.6,0.6,4.4,2.5,4.9,5l9.1-2.2 + c0.2,0,0.4,0.1,0.3,0.3L67.5,165.5z M53.2,162.6c-1.5-0.4-2.8,0.5-3.2,2.2l-0.8,3.6c0,0.1,0,0.2,0.1,0.2l4.8,1.1 + c0.1,0,0.2,0,0.2-0.1l0.8-3.6C55.5,164.2,54.8,162.9,53.2,162.6z"/> + <path class="st10" d="M49.8,151.9c-0.2-0.1-0.3-0.2-0.2-0.4l1.3-3.7c0.1-0.2,0.2-0.3,0.4-0.2l19.5,6.5c0.2,0.1,0.3,0.2,0.2,0.4 + l-1.3,3.7c-0.1,0.2-0.2,0.3-0.4,0.2L49.8,151.9z"/> + <path class="st10" d="M74.3,145.9c-0.1,0.2-0.3,0.3-0.4,0.2l-21.5-2.2c-0.2,0-0.3-0.2-0.2-0.4l1.6-3.7c0.1-0.2,0.2-0.3,0.4-0.2 + l14.4,1.8l0-0.1l-11-9.4c-0.2-0.1-0.2-0.3-0.1-0.5l1.6-3.7c0.1-0.2,0.2-0.2,0.4-0.1l16,14.5c0.1,0.1,0.2,0.3,0.1,0.5L74.3,145.9z" + /> + <path class="st10" d="M64.1,120c-0.1-0.2-0.2-0.3-0.1-0.5l2-3.3c0.1-0.2,0.3-0.2,0.5-0.2l21.3,4.6c0.2,0,0.3,0.2,0.2,0.3l-2.1,3.5 + c-0.1,0.2-0.3,0.2-0.5,0.2l-3.8-0.9l-3.9,6.3l2.5,2.9c0.2,0.2,0.2,0.3,0.1,0.5l-2.1,3.5c-0.1,0.2-0.3,0.2-0.4,0L64.1,120z + M77.6,122.7l-7.6-1.8l0,0.1l5.1,5.9L77.6,122.7z"/> + <path class="st10" d="M80.1,113.9c-2.6-2-3.3-2.8-4.1-4c-2-3-1.7-6.2,0.6-9.1c2.2-2.8,5.2-3.7,8.3-2.8c0.2,0,0.3,0.2,0.2,0.4 + l-0.9,3.6c0,0.2-0.2,0.3-0.4,0.2c-1.4-0.4-2.9-0.3-4,1.1c-1,1.3-1,2.7-0.2,3.9c0.5,0.7,1,1.2,3.3,3.1c2.4,1.9,3,2.3,3.8,2.6 + c1.4,0.5,2.8,0.3,3.8-1c1.1-1.4,0.9-2.8,0.2-4.1c-0.1-0.2,0-0.3,0.2-0.4l3.3-1.7c0.2-0.1,0.3-0.1,0.4,0.1c1.6,2.8,1.3,5.9-0.9,8.7 + c-2.3,2.9-5.4,3.9-8.8,2.6C83.6,116.5,82.7,115.9,80.1,113.9z"/> + <path class="st10" d="M103.1,103.4c-0.1,0.1-0.3,0.1-0.4,0L97,97.5L83.9,93c-0.2-0.1-0.2-0.2-0.1-0.4l2.9-2.8 + c0.2-0.2,0.3-0.2,0.6-0.1l8.1,2.9l0.1-0.1l-2.6-8.2c-0.1-0.2,0-0.4,0.1-0.5l2.8-2.7c0.2-0.2,0.3-0.1,0.4,0.1l4.2,13.2l5.7,5.8 + c0.1,0.1,0.1,0.3,0,0.4L103.1,103.4z"/> + <path class="st10" d="M104.8,74.3c-0.1-0.2-0.1-0.3,0.1-0.4l3.2-2.3c0.2-0.1,0.3-0.1,0.4,0.1l12.2,16.5c0.1,0.2,0.1,0.3-0.1,0.4 + l-3.2,2.3c-0.2,0.1-0.3,0.1-0.4-0.1L104.8,74.3z"/> + <path class="st10" d="M121.5,84.5c-0.2,0-0.3-0.2-0.3-0.4l0.6-3.5c0-0.2,0.2-0.3,0.4-0.3c1.8,0.2,3.9,0.2,5.9-1 + c1.9-1.1,2.4-2.7,1.7-3.9c-0.6-1.1-1.7-1.4-4-0.4l-1,0.4c-4,1.7-7.1,1.2-9-2c-2-3.3-0.8-7.1,3.1-9.4c2.4-1.4,5.1-2.1,7.3-1.8 + c0.2,0,0.3,0.1,0.3,0.4l-0.2,3.4c0,0.2-0.1,0.3-0.3,0.3c-1.9-0.1-3.6,0.2-5,1.1c-1.6,1-1.9,2.3-1.2,3.4c0.6,1,1.8,1.3,4,0.3l1-0.4 + c4-1.7,7-1.2,9,2.1c2,3.3,1,7.2-3.7,10C127.1,84.5,123.7,85,121.5,84.5z"/> + <path class="st10" d="M143.6,52.7c0-0.2,0.1-0.4,0.3-0.4l3.7-1.3c0.2-0.1,0.4,0,0.5,0.2l13.8,16.8c0.1,0.2,0.1,0.3-0.1,0.4 + l-3.8,1.4c-0.2,0.1-0.4,0-0.5-0.2l-2.4-3.1l-7,2.5l0.2,3.9c0,0.2-0.1,0.4-0.3,0.4l-3.8,1.4c-0.2,0.1-0.3,0-0.3-0.2L143.6,52.7z + M152.6,63.2l-4.8-6.1l-0.1,0l0.3,7.8L152.6,63.2z"/> + <path class="st10" d="M169.2,58.4l-2-12.9c0-0.2,0.1-0.3,0.3-0.4l3.9-0.6c0.2,0,0.3,0.1,0.4,0.3l2.1,13c0.4,2.5,2,3.7,4.1,3.4 + c2.1-0.3,3.2-2,2.9-4.5l-2.1-13c0-0.2,0.1-0.3,0.3-0.4l3.9-0.6c0.2,0,0.3,0.1,0.4,0.3l2,12.9c0.8,5.2-2.1,8.5-6.7,9.3 + C173.8,65.9,170.1,63.6,169.2,58.4z"/> + <path class="st10" d="M189.4,42.5c0-0.2,0.1-0.3,0.3-0.3l3.7-0.1c0.2,0,0.4,0.1,0.5,0.3l7.7,13.2l0.2,0l-0.2-13.3 + c0-0.2,0.1-0.3,0.3-0.3l3.5-0.1c0.2,0,0.3,0.1,0.3,0.3l0.3,20.5c0,0.2-0.1,0.3-0.3,0.3l-3.7,0.1c-0.2,0-0.4-0.1-0.5-0.3l-7.7-13.2 + l-0.2,0l0.2,13.3c0,0.2-0.1,0.3-0.3,0.3l-3.5,0.1c-0.2,0-0.3-0.1-0.3-0.3L189.4,42.5z"/> + <path class="st10" d="M211.3,42.7c0-0.2,0.2-0.3,0.3-0.3l3.9,0.3c0.2,0,0.3,0.2,0.3,0.3l-1.8,20.5c0,0.2-0.2,0.3-0.3,0.3l-3.9-0.3 + c-0.2,0-0.3-0.2-0.3-0.3L211.3,42.7z"/> + <path class="st10" d="M223,65.1c-0.2,0-0.3-0.2-0.3-0.4l-2.9-21.4c0-0.2,0.1-0.3,0.3-0.3l4,0.7c0.2,0,0.3,0.2,0.3,0.4l1.7,14.4 + l0.1,0l6.5-12.9c0.1-0.2,0.2-0.3,0.5-0.2l3.9,0.7c0.2,0,0.3,0.2,0.2,0.4l-10.3,19c-0.1,0.2-0.2,0.3-0.4,0.2L223,65.1z"/> + <path class="st10" d="M241.5,47.7c0.1-0.2,0.2-0.3,0.4-0.2l12.9,4.1c0.2,0.1,0.3,0.2,0.2,0.4l-1,3.2c-0.1,0.2-0.2,0.3-0.4,0.2 + l-8.7-2.8c-0.1,0-0.2,0-0.2,0.1l-1.3,4c0,0.1,0,0.2,0.1,0.2l7.2,2.3c0.2,0.1,0.3,0.2,0.2,0.4l-1,3.1c-0.1,0.2-0.2,0.3-0.4,0.2 + l-7.2-2.3c-0.1,0-0.2,0-0.2,0.1l-1.3,4.2c0,0.1,0,0.2,0.1,0.2l8.7,2.8c0.2,0.1,0.3,0.2,0.2,0.4l-1,3.2c-0.1,0.2-0.2,0.3-0.4,0.2 + l-12.9-4.1c-0.2-0.1-0.3-0.2-0.2-0.4L241.5,47.7z"/> + <path class="st10" d="M261.8,77.8c-0.3-0.1-0.3-0.2-0.3-0.5l0-8.6l-2.6-1.2c-0.1-0.1-0.2,0-0.2,0.1l-3.2,6.8 + c-0.1,0.2-0.2,0.2-0.4,0.1l-3.6-1.7c-0.2-0.1-0.2-0.2-0.1-0.4l8.7-18.6c0.1-0.2,0.2-0.2,0.4-0.1l7.6,3.6c3.9,1.8,5.3,5.5,3.7,9 + c-1.2,2.4-3.4,3.8-5.9,3.7l0.2,9.3c0,0.2-0.2,0.3-0.4,0.2L261.8,77.8z M267.7,64.5c0.7-1.4,0.1-2.8-1.5-3.6l-3.4-1.6 + c-0.1-0.1-0.2,0-0.2,0.1l-2.1,4.4c-0.1,0.1,0,0.2,0.1,0.2l3.4,1.6C265.6,66.4,267,66,267.7,64.5z"/> + <path class="st10" d="M268.6,78.4c0-0.2,0-0.4,0.3-0.5l3.5-1c0.2-0.1,0.3,0,0.4,0.2c0.6,1.7,1.6,3.6,3.5,4.8 + c1.9,1.2,3.5,1,4.3-0.2c0.7-1,0.5-2.1-1.5-3.8l-0.9-0.7c-3.3-2.8-4.2-5.8-2.2-9c2.1-3.3,6-3.8,9.8-1.4c2.4,1.5,4.1,3.6,4.8,5.8 + c0.1,0.2,0,0.3-0.2,0.4l-3.1,1.3c-0.2,0.1-0.3,0-0.4-0.2c-0.8-1.8-1.8-3.1-3.2-4c-1.6-1-2.9-0.7-3.6,0.4c-0.7,1-0.3,2.1,1.5,3.7 + l0.9,0.7c3.3,2.9,4.2,5.8,2.1,9c-2.1,3.2-6,4.1-10.6,1.1C271.1,83.4,269.1,80.6,268.6,78.4z"/> + <path class="st10" d="M300.6,78.6c0.2-0.1,0.3-0.1,0.5,0l3,2.5c0.2,0.1,0.2,0.3,0.1,0.5l-7.9,20.2c-0.1,0.2-0.2,0.2-0.4,0.1 + l-3.1-2.6c-0.2-0.1-0.2-0.3-0.1-0.5l1.5-3.6l-5.6-4.8l-3.3,2c-0.2,0.1-0.3,0.1-0.5,0l-3.1-2.6c-0.2-0.1-0.1-0.3,0-0.4L300.6,78.6z + M295.8,91.5l3-7.2l-0.1-0.1l-6.6,4.1L295.8,91.5z"/> + <path class="st10" d="M312.7,89.6c0.1-0.1,0.3-0.1,0.4,0l2.6,2.9c0.1,0.1,0.1,0.3,0,0.4l-12.3,11.1c-0.1,0.1-0.1,0.2,0,0.3 + l6.2,6.9c0.1,0.1,0.1,0.3,0,0.4l-2.6,2.3c-0.1,0.1-0.3,0.1-0.4,0l-9.2-10.2c-0.1-0.1-0.1-0.3,0-0.4L312.7,89.6z"/> + <path class="st10" d="M318.5,131.5c-0.1-0.2-0.1-0.4,0-0.6l4.7-7.2l-1.5-2.4c-0.1-0.1-0.2-0.1-0.3-0.1l-6.4,4 + c-0.2,0.1-0.3,0.1-0.4-0.1l-2.1-3.4c-0.1-0.2-0.1-0.3,0.1-0.4l17.5-10.8c0.2-0.1,0.3-0.1,0.4,0.1l4.4,7.2c2.3,3.7,1.5,7.5-1.8,9.6 + c-2.3,1.4-4.9,1.3-7-0.1l-4.9,7.9c-0.1,0.2-0.3,0.2-0.4,0L318.5,131.5z M330.8,123.6c1.3-0.8,1.6-2.3,0.7-3.8l-2-3.2 + c-0.1-0.1-0.2-0.1-0.3-0.1l-4.2,2.6c-0.1,0.1-0.1,0.2-0.1,0.3l2,3.2C327.9,124,329.4,124.4,330.8,123.6z"/> + <path class="st10" d="M340.7,128.7c0.2-0.1,0.3,0,0.4,0.1l1.7,3.5c0.1,0.2,0,0.3-0.1,0.4l-18.4,9c-0.2,0.1-0.3,0-0.4-0.1l-1.7-3.5 + c-0.1-0.2,0-0.3,0.1-0.4L340.7,128.7z"/> + <path class="st10" d="M335.3,140.9c2.9-1.1,4.1-1.4,5.6-1.5c3.6-0.2,6.2,2,7.5,5.5c1.4,3.7,0.4,6.8-1.6,8.6 + c-0.1,0.2-0.3,0.2-0.5,0l-2.5-2.6c-0.1-0.2-0.1-0.3,0-0.5c1-1.3,1.4-2.5,0.8-4.2c-0.6-1.7-1.9-2.4-3.4-2.4c-0.8,0-1.8,0.3-4.3,1.2 + c-2.6,1-3.5,1.4-4.1,1.9c-1.2,0.9-1.6,2.3-1,4c0.6,1.5,1.8,2.5,3.2,2.4c0.5,0,1.2-0.2,2-0.5c0.1,0,0.2-0.1,0.1-0.2l-1-2.7 + c-0.1-0.2,0-0.3,0.2-0.4l2.8-1c0.2-0.1,0.3,0,0.4,0.2l2.5,6.8c0.1,0.2,0,0.3-0.2,0.4l-1.6,0.6c-1.8,0.6-3.4,1.1-4.6,1.2 + c-3.5,0.2-6.3-1.9-7.6-5.4c-1.3-3.5-0.7-6.9,2.1-9.1C331.3,142.6,332.4,142,335.3,140.9z"/> + <path class="st10" d="M352.3,158.4c0.2,0,0.3,0.1,0.4,0.2l0.8,3.9c0,0.2-0.1,0.3-0.2,0.4l-7.8,1.7c-0.1,0-0.2,0.1-0.1,0.2l1.5,6.7 + c0,0.1,0.1,0.2,0.2,0.1l7.8-1.7c0.2,0,0.3,0.1,0.4,0.2l0.8,3.9c0,0.2-0.1,0.3-0.2,0.4l-20.1,4.4c-0.2,0-0.3-0.1-0.4-0.2l-0.8-3.9 + c0-0.2,0.1-0.3,0.2-0.4l8-1.7c0.1,0,0.2-0.1,0.1-0.2l-1.5-6.7c0-0.1-0.1-0.2-0.2-0.1l-8,1.7c-0.2,0-0.3-0.1-0.4-0.2l-0.8-3.9 + c0-0.2,0.1-0.3,0.2-0.4L352.3,158.4z"/> + <path class="st10" d="M336.2,186.9c0-0.2,0.1-0.3,0.3-0.3l16.5-1.3c0.1,0,0.2-0.1,0.2-0.2l-0.4-5.3c0-0.2,0.1-0.3,0.3-0.3l3.4-0.3 + c0.2,0,0.3,0.1,0.3,0.3l1.3,15.6c0,0.2-0.1,0.3-0.3,0.3l-3.4,0.3c-0.2,0-0.3-0.1-0.3-0.3l-0.4-5.3c0-0.1-0.1-0.2-0.2-0.2 + l-16.5,1.3c-0.2,0-0.3-0.1-0.3-0.3L336.2,186.9z"/> + </g> + <g id="Mullvad_VPN"> + <path class="st10" d="M103.7,296.2c0.1-0.2,0.3-0.2,0.5,0l3.3,2.8c0.2,0.2,0.3,0.4,0.2,0.7l-4.3,14.8l0.1,0.1l13.8-6.8 + c0.2-0.1,0.5-0.1,0.7,0.1l3.2,2.7c0.2,0.1,0.2,0.3,0,0.5l-15.5,18.3c-0.1,0.2-0.3,0.2-0.5,0l-3.1-2.7c-0.2-0.1-0.2-0.3,0-0.5 + l9-10.6l-0.1-0.1l-10.2,5c-0.3,0.2-0.6,0.1-0.8-0.1l-1.9-1.6c-0.2-0.2-0.3-0.5-0.2-0.8l3.2-10.9l-0.1-0.1l-9,10.6 + c-0.1,0.2-0.3,0.2-0.5,0l-3.1-2.7c-0.2-0.1-0.2-0.3,0-0.5L103.7,296.2z"/> + <path class="st10" d="M116.3,326l7.7-13.2c0.1-0.2,0.3-0.2,0.5-0.1l4,2.3c0.2,0.1,0.2,0.3,0.1,0.5l-7.7,13.3 + c-1.5,2.5-0.9,4.8,1.3,6.1c2.1,1.2,4.4,0.6,5.9-1.9l7.7-13.3c0.1-0.2,0.3-0.2,0.5-0.1l4,2.3c0.2,0.1,0.2,0.3,0.1,0.5l-7.7,13.2 + c-3.1,5.3-8.2,6.2-12.9,3.5C115,336.2,113.2,331.3,116.3,326z"/> + <path class="st10" d="M143.5,323.6c0.1-0.2,0.3-0.3,0.5-0.2l4.3,1.7c0.2,0.1,0.3,0.3,0.2,0.5l-7.1,18.1c-0.1,0.1,0,0.2,0.1,0.3 + l10.2,4c0.2,0.1,0.3,0.3,0.2,0.5l-1.5,3.8c-0.1,0.2-0.3,0.3-0.5,0.2l-15-5.9c-0.2-0.1-0.3-0.3-0.2-0.5L143.5,323.6z"/> + <path class="st10" d="M161.1,330.2c0.1-0.2,0.2-0.3,0.4-0.3l4.5,1.1c0.2,0.1,0.3,0.2,0.3,0.4l-4.5,18.9c0,0.1,0,0.2,0.2,0.3 + l10.6,2.5c0.2,0.1,0.3,0.2,0.3,0.4l-0.9,3.9c-0.1,0.2-0.2,0.3-0.4,0.3l-15.7-3.7c-0.2-0.1-0.3-0.2-0.3-0.4L161.1,330.2z"/> + <path class="st10" d="M180.7,358.9c-0.3,0-0.4-0.2-0.4-0.4l-5.3-24.7c0-0.3,0.1-0.4,0.4-0.4l4.7,0.5c0.3,0,0.4,0.2,0.4,0.4 + l3.2,16.7l0.1,0l6.5-15.6c0.1-0.2,0.3-0.3,0.5-0.3l4.7,0.5c0.2,0,0.3,0.2,0.2,0.4l-10.4,23c-0.1,0.2-0.3,0.3-0.5,0.3L180.7,358.9z + "/> + <path class="st10" d="M202.4,335.6c0.1-0.2,0.2-0.4,0.5-0.4l4.6-0.2c0.3,0,0.4,0.1,0.5,0.3l9.2,23.7c0.1,0.2,0,0.4-0.2,0.4 + l-4.7,0.2c-0.3,0-0.4-0.1-0.5-0.3l-1.6-4.3l-8.7,0.3l-1.2,4.4c-0.1,0.3-0.2,0.4-0.5,0.4l-4.8,0.2c-0.3,0-0.3-0.1-0.3-0.4 + L202.4,335.6z M208.5,350.6l-3.1-8.5l-0.1,0l-2.5,8.8L208.5,350.6z"/> + <path class="st10" d="M217.8,334.8c0-0.2,0.1-0.4,0.3-0.4l9-1.8c4.2-0.8,7.6,0.4,9.5,3.8c0.7,1.3,1.2,2.6,2,6.5s0.8,5.4,0.7,6.8 + c-0.5,3.9-3,6.3-7.3,7.1l-9,1.8c-0.2,0-0.4-0.1-0.4-0.3L217.8,334.8z M227.1,352.9l2.7-0.5c2.4-0.5,3.7-1.5,4-3.6 + c0.1-0.8,0.1-1.7-0.6-4.9c-0.6-3.1-1-4-1.3-4.7c-1-1.8-2.6-2.3-5-1.8l-2.7,0.5c-0.1,0-0.2,0.1-0.2,0.3l2.9,14.5 + C226.9,352.9,227,353,227.1,352.9z"/> + <path class="st10" d="M261.1,347.9c-0.2,0.1-0.4,0-0.6-0.1l-16.7-18.9c-0.2-0.2-0.1-0.4,0.1-0.5l4.3-1.9c0.2-0.1,0.4-0.1,0.6,0.1 + l10.9,13l0.1,0l-2-16.8c0-0.3,0.1-0.4,0.3-0.5l4.3-1.9c0.2-0.1,0.4,0,0.4,0.3l2.2,25.1c0,0.2-0.1,0.4-0.3,0.5L261.1,347.9z"/> + <path class="st10" d="M277.5,340.3c-0.2,0.1-0.4,0.1-0.5-0.1l-12.7-20.4c-0.1-0.2-0.1-0.4,0.1-0.5l8.1-5.1c4.6-2.8,9-1.8,11.5,2.2 + c2.5,4,1.4,8.5-3.1,11.3l-3.7,2.3c-0.1,0.1-0.1,0.2-0.1,0.3l4.4,7c0.1,0.2,0.1,0.4-0.1,0.5L277.5,340.3z M279.5,319.2 + c-1.1-1.7-2.9-2.1-4.8-0.9l-3.5,2.2c-0.1,0.1-0.1,0.2-0.1,0.3l3.3,5.3c0.1,0.1,0.2,0.1,0.3,0.1l3.5-2.2 + C280.2,322.8,280.6,320.9,279.5,319.2z"/> + <path class="st10" d="M281.7,308.7c-0.1-0.2-0.1-0.4,0-0.5l3.3-2.9c0.2-0.2,0.4-0.2,0.7-0.1l16.8,6l0.1-0.1l-10.2-11.7 + c-0.1-0.2-0.1-0.4,0-0.5l3.1-2.7c0.2-0.1,0.4-0.1,0.5,0l15.8,18.1c0.1,0.2,0.1,0.4,0,0.5l-3.3,2.8c-0.2,0.2-0.4,0.2-0.7,0.1 + l-16.8-6l-0.1,0.1l10.2,11.7c0.1,0.2,0.1,0.4,0,0.5l-3.1,2.7c-0.2,0.1-0.4,0.1-0.5,0L281.7,308.7z"/> + </g> </g> </svg> diff --git a/templates/membership.html b/templates/membership.html index 8c3efaec..d1382043 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,25 +42,16 @@ <div class="container" id="shallot"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> - <div class="col-md-4 col-xl-4 my-2"> + <div class="col-md-6 col-xl-6 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN"> <div class="card-body"> - <h4><a href="#">Mullvad VPN</a></h4> - Some description - </div> - </div> - </div> - <div class="col-md-4 col-xl-4 my-2"> - <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt="Card image cap"> - <div class="card-body"> - <h4><a href="#">Shallot Onion Member</a></h4> - Some description + <p><a href="#">Mullvad VPN</a></p> + Mullvad is a VPN service that helps users keep their online activity, identity, and location private. With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective. </div> </div> </div> - <div class="col-md-4 col-xl-4 my-2"> + <div class="col-md-6 col-xl-6 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="#" alt="Card image cap"> <div class="card-body"> @@ -69,7 +60,6 @@ </div> </div> </div> - </div> </div> <div class="container" id="vidalia"> <div class="row py-5">

1 0

[tpo/staging] Include CC links
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 56d4e85ecd80a5caabf7fc7885368de48d1cc0de Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 13:52:34 2020 -0300 Include CC links --- templates/membership.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/membership.html b/templates/membership.html index b70fb7e1..d0058337 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -39,6 +39,13 @@ </div> </div> </div> +<div class="container"> + <div class="row p-5 my-5 border text-center"> + <p> + Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + </p> + </div> + </div> <div class="container" id="shallot"> <div class="row py-5"> <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3>

1 0

[tpo/staging] Fix avast logo
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit dafbe7a290c9007ab1d641778ececc59a2231add Author: gus <gus(a)torproject.org> Date: Fri Jul 24 14:04:40 2020 -0400 Fix avast logo --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index d0058337..51755a34 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -81,7 +81,7 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0

[tpo/staging] Merge branch 'membership'
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 081f7d12d13a8835598fccf3f56f267558b4ef02 Merge: 81066907 56d4e85e Author: gus <gus(a)torproject.org> Date: Fri Jul 24 13:33:50 2020 -0400 Merge branch 'membership' assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 +++++++++++++++++++++ assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes content/about/membership/contents.lr | 13 ++ templates/membership.html | 138 +++++++++++++++ 8 files changed, 348 insertions(+)

1 0

[tpo/staging] Point Tor Browser downloads at archive.tpo
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit ea8e9945f47613c43bdea3579c053024c39fda34 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Jul 26 19:32:23 2020 +0000 Point Tor Browser downloads at archive.tpo We're in the process of unbreaking it, but it'll take some time. --- lego | 2 +- templates/hero-download.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 7f2289bf..fb083d69 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit fb083d69aa0191f891d1e3243db89e474a1c8c0d diff --git a/templates/hero-download.html b/templates/hero-download.html index eabd2e40..b9577940 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -10,7 +10,7 @@ <div class="oval-2 bg-darker"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} - {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} + {% set download_prefix = 'https://archive.torproject.org/tor-package-archive/torbrowser/' + t.version + '/' %} {% if alt_l == 'en' %} {% set alt_l = 'en-US' %} {% elif alt_l == 'es' %}

1 0

[tpo/staging] Fix a phrase in membership page
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit be12e1c974e3c7971ce720726a4622914308d0e0 Author: gus <gus(a)torproject.org> Date: Fri Jul 24 14:10:30 2020 -0400 Fix a phrase in membership page --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 51755a34..171b5285 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,7 +42,7 @@ <div class="container"> <div class="row p-5 my-5 border text-center"> <p> - Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. </p> </div> </div>

1 0