[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [community/staging] Merge branch 'master' of git-rw.torproject.org:project/web/community
commit 7e19f0a143e8d02075b6e6d6075040c9cf626722
Merge: 8e8f8cd f8fadcc
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
Date: Wed Jun 5 15:08:59 2019 +0200
Merge branch 'master' of git-rw.torproject.org:project/web/community
assets/scss/_tor.scss | 23 +-
assets/static/bootstrap.css | 9640 ++++++++++++--------
assets/static/bootstrap.css.map | 8 +-
assets/static/images/home/png/outreach.png | Bin 0 -> 82148 bytes
assets/static/images/home/png/relay-operations.png | Bin 0 -> 131576 bytes
assets/static/images/home/png/training.png | Bin 0 -> 115177 bytes
assets/static/images/home/png/user-research.png | Bin 0 -> 95124 bytes
assets/static/images/home/svg/user-research.svg | 1 +
content/localization/contents.lr | 4 +-
content/localization/current-status/contents.lr | 4 +
content/onion-services/contents+en.lr | 2 +
content/onion-services/contents+es.lr | 21 +
content/onion-services/contents+fr.lr | 21 +
content/onion-services/contents.lr | 2 +
content/outreach/contents+en.lr | 21 +
content/outreach/contents+es.lr | 21 +
content/outreach/contents+fr.lr | 21 +
content/outreach/contents.lr | 4 +-
content/relay-operations/contents.lr | 2 +-
content/training/contents+en.lr | 23 +
content/training/contents+es.lr | 23 +
content/training/contents+fr.lr | 23 +
content/training/contents.lr | 8 +-
.../{user-testing => user-research}/contents.lr | 12 +-
.../current/contents.lr | 6 +-
.../signup/contents.lr | 6 +-
databags/menu+en.ini | 4 +
databags/pagenav+en.ini | 22 +-
templates/header.html | 2 +-
templates/hero.html | 22 +-
templates/localization.html | 29 +-
templates/navbar.html | 4 +-
templates/pagenav.html | 2 +-
templates/relay-operations.html | 13 +-
.../{user-testing.html => user-research.html} | 13 +-
35 files changed, 6274 insertions(+), 3733 deletions(-)
diff --cc content/localization/current-status/contents.lr
index c586ea9,16ee949..6c34346
--- a/content/localization/current-status/contents.lr
+++ b/content/localization/current-status/contents.lr
@@@ -19,3 -19,4 +19,7 @@@ body
Our last update on the Translations is here:
<img class="col-lg-6" src="../../static/images/localization/stats.png">
++<<<<<<< HEAD
++=======
+
++>>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b
diff --cc content/onion-services/contents+es.lr
index 0000000,0077c71..c469f31
mode 000000,100644..100644
--- a/content/onion-services/contents+es.lr
+++ b/content/onion-services/contents+es.lr
@@@ -1,0 -1,23 +1,21 @@@
+ section: onion services
+ ---
+ section_id: onion-services
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: .onion Services
+ ---
+ subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
+ ---
+ cta: Grow your .onion
+ ---
+ key: 6
+ ---
+ html: onion-services.html
+ ---
+ body:
+
-##What are Onion Services?
-
+ Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --cc content/onion-services/contents+fr.lr
index 0000000,0077c71..c469f31
mode 000000,100644..100644
--- a/content/onion-services/contents+fr.lr
+++ b/content/onion-services/contents+fr.lr
@@@ -1,0 -1,23 +1,21 @@@
+ section: onion services
+ ---
+ section_id: onion-services
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: .onion Services
+ ---
+ subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
+ ---
+ cta: Grow your .onion
+ ---
+ key: 6
+ ---
+ html: onion-services.html
+ ---
+ body:
+
-##What are Onion Services?
-
+ Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --cc content/outreach/contents+en.lr
index 0000000,f11f905..331a434
mode 000000,100644..100644
--- a/content/outreach/contents+en.lr
+++ b/content/outreach/contents+en.lr
@@@ -1,0 -1,23 +1,21 @@@
+ section: outreach
+ ---
+ section_id: outreach
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Outreach
+ ---
+ subtitle: Bring Tor swag to our next community event.
+ ---
+ cta: Join the Tor community
+ ---
-key: 3
++key: 4
+ ---
+ html: outreach.html
+ ---
+ body:
+
-##Tell the world about Tor
-
+ We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --cc content/outreach/contents+es.lr
index 0000000,f11f905..331a434
mode 000000,100644..100644
--- a/content/outreach/contents+es.lr
+++ b/content/outreach/contents+es.lr
@@@ -1,0 -1,23 +1,21 @@@
+ section: outreach
+ ---
+ section_id: outreach
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Outreach
+ ---
+ subtitle: Bring Tor swag to our next community event.
+ ---
+ cta: Join the Tor community
+ ---
-key: 3
++key: 4
+ ---
+ html: outreach.html
+ ---
+ body:
+
-##Tell the world about Tor
-
+ We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --cc content/outreach/contents+fr.lr
index 0000000,f11f905..331a434
mode 000000,100644..100644
--- a/content/outreach/contents+fr.lr
+++ b/content/outreach/contents+fr.lr
@@@ -1,0 -1,23 +1,21 @@@
+ section: outreach
+ ---
+ section_id: outreach
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Outreach
+ ---
+ subtitle: Bring Tor swag to our next community event.
+ ---
+ cta: Join the Tor community
+ ---
-key: 3
++key: 4
+ ---
+ html: outreach.html
+ ---
+ body:
+
-##Tell the world about Tor
-
+ We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --cc content/training/contents+en.lr
index 0000000,1cb0f37..31ea356
mode 000000,100644..100644
--- a/content/training/contents+en.lr
+++ b/content/training/contents+en.lr
@@@ -1,0 -1,23 +1,23 @@@
-section: training
++section: Training
+ ---
+ section_id: training
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Training
+ ---
+ subtitle: Do you teach your community about using Tor? These resources are for you.
+ ---
+ cta: Check our resources
+ ---
-key: 1
++key: 3
+ ---
+ html: training.html
+ ---
+ body:
+
-##We want to teach the world about Tor. Will you help?
++Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered.
+
-Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
++For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
diff --cc content/training/contents+es.lr
index 0000000,1cb0f37..31ea356
mode 000000,100644..100644
--- a/content/training/contents+es.lr
+++ b/content/training/contents+es.lr
@@@ -1,0 -1,23 +1,23 @@@
-section: training
++section: Training
+ ---
+ section_id: training
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Training
+ ---
+ subtitle: Do you teach your community about using Tor? These resources are for you.
+ ---
+ cta: Check our resources
+ ---
-key: 1
++key: 3
+ ---
+ html: training.html
+ ---
+ body:
+
-##We want to teach the world about Tor. Will you help?
++Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered.
+
-Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
++For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
diff --cc content/training/contents+fr.lr
index 0000000,1cb0f37..31ea356
mode 000000,100644..100644
--- a/content/training/contents+fr.lr
+++ b/content/training/contents+fr.lr
@@@ -1,0 -1,23 +1,23 @@@
-section: training
++section: Training
+ ---
+ section_id: training
+ ---
+ color: primary
+ ---
+ _template: layout.html
+ ---
+ title: Training
+ ---
+ subtitle: Do you teach your community about using Tor? These resources are for you.
+ ---
+ cta: Check our resources
+ ---
-key: 1
++key: 3
+ ---
+ html: training.html
+ ---
+ body:
+
-##We want to teach the world about Tor. Will you help?
++Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered.
+
-Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
++For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
diff --cc content/training/contents.lr
index 5fa7f6a,1cb0f37..79f955f
--- a/content/training/contents.lr
+++ b/content/training/contents.lr
@@@ -18,6 -18,6 +18,10 @@@ html: training.htm
---
body:
- Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered.
+ ##We want to teach the world about Tor. Will you help?
++<<<<<<< HEAD
+For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam#Communication) for more help.
++=======
+ Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact].
++>>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b
diff --cc content/user-research/contents.lr
index 38001f3,dfeb5e0..84ebecd
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@@ -1,18 -1,20 +1,22 @@@
++<<<<<<< HEAD:content/user-testing/contents.lr
+section: User Testing
++=======
+ section: user research
++>>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b:content/user-research/contents.lr
---
- section_id: user-testing
+ section_id: user-research
---
color: primary
---
_template: layout.html
---
- title: User Testing
+ title: User Research
---
-subtitle: We conduct user research while also respecting user privacy.
----
-cta: Learn how you can help
+subtitle: We conduct user research while also respecting user privacy. Learn how you can help.
---
- key: 2
+ key: 4
---
- html: user-testing.html
+ html: user-research.html
---
body:
diff --cc templates/localization.html
index fe54039,a661fcb..fec74ed
--- a/templates/localization.html
+++ b/templates/localization.html
@@@ -1,23 -1,19 +1,31 @@@
<div class="container py-5">
- <h2 class="text-primary">{{ _('Localization is how we reach a global community.') }}</h2>
<div class="row py-5">
- <div class="col-8">
+ <div class="col-lg-7">
{{ this.body }}
</div>
++<<<<<<< HEAD
+ <div class="col-4 bg-light">
+ <div class="illo-container">
+ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ this.section }}" />
+ </div>
++=======
+ <div class="col-lg-5">
+ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
++>>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b
</div>
</div>
<div class="row">
{% for child in this.children|sort(attribute='key') %}
- <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
- <div class="card h-100 border-0">
+ <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3">
+ <div class="card h-100">
<div class="card-body">
<div class="card-body">
++<<<<<<< HEAD
+ <h4 class="text-primary">.{{ child.key }}</h4>
+ <h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ _(child.title) }}</a></h4>
++=======
+ <h4 class="card-title text-primary"><a href="/{{ this.alt}}{{ child.path }}">{{ _(child.title) }}</a></h4>
++>>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b
<p class="card-text">{{ _(child.subtitle) }}</p>
</div>
</div>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits