[tor-commits] [community/staging] Merge branch 'master' of dip.torproject.org:pili/community into onion-services
pili at torproject.org
pili at torproject.org
Thu Jun 6 13:05:51 UTC 2019
commit 01a51cd3363822af376fdce7968dbe2ce55b2874
Merge: 656a83e 7e19f0a
Author: Pili Guerra <pili at piliguerra.com>
Date: Thu Jun 6 14:57:39 2019 +0200
Merge branch 'master' of dip.torproject.org:pili/community into onion-services
.gitlab/issue_templates/Bug.md | 45 +
.gitlab/issue_templates/Feature.md | 24 +
assets/scss/_tor.scss | 23 +-
assets/static/bootstrap.css | 9640 ++++++++++++--------
assets/static/bootstrap.css.map | 8 +-
assets/static/images/home/png/user-research.png | Bin 0 -> 95124 bytes
content/localization/contents.lr | 2 +-
content/localization/current-status/contents.lr | 4 +
content/onion-services/contents+es.lr | 2 -
content/outreach/contents+en.lr | 4 +-
content/outreach/contents+es.lr | 7 +
content/outreach/contents+fr.lr | 7 +
content/outreach/contents.lr | 2 +-
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 | 6 +-
.../{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 | 31 +-
templates/navbar.html | 4 +-
templates/pagenav.html | 2 +-
templates/relay-operations.html | 15 +-
.../{user-testing.html => user-research.html} | 13 +-
30 files changed, 6236 insertions(+), 3748 deletions(-)
diff --cc content/outreach/contents+es.lr
index f11f905,331a434..d1e0c88
--- a/content/outreach/contents+es.lr
+++ b/content/outreach/contents+es.lr
@@@ -12,12 -12,10 +12,19 @@@ subtitle: Bring Tor swag to our next co
---
cta: Join the Tor community
---
++<<<<<<< HEAD
+key: 3
++=======
+ key: 4
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722
---
html: outreach.html
---
body:
++<<<<<<< HEAD
+##Tell the world about Tor
+
++=======
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722
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 f11f905,331a434..d1e0c88
--- a/content/outreach/contents+fr.lr
+++ b/content/outreach/contents+fr.lr
@@@ -12,12 -12,10 +12,19 @@@ subtitle: Bring Tor swag to our next co
---
cta: Join the Tor community
---
++<<<<<<< HEAD
+key: 3
++=======
+ key: 4
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722
---
html: outreach.html
---
body:
++<<<<<<< HEAD
+##Tell the world about Tor
+
++=======
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722
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.lr
index 1845385,79f955f..f4edbfd
--- a/content/training/contents.lr
+++ b/content/training/contents.lr
@@@ -20,8 -20,8 +20,4 @@@ body
##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].
- >>>>>>> f8fadcc... remove titles from templates
->>>>>>> f8fadcc8c3533f91d942bc637db28c6b97283d8b
diff --cc templates/localization.html
index d52e348,fec74ed..fa8388d
--- a/templates/localization.html
+++ b/templates/localization.html
@@@ -1,13 -1,9 +1,8 @@@
<div class="container py-5">
- <h2 class="text-primary">{{ _('Localization is how we reach a global community.') }}</h2>
<div class="row py-5">
- <<<<<<< HEAD
- <div class="col-8">
- =======
<div class="col-lg-7">
- >>>>>>> f8fadcc... remove titles from templates
{{ 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 }}" />
@@@ -16,18 -16,16 +11,11 @@@
</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="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>
- </h4>
- >>>>>>> b231142... Use two columns template and fix current section pagenav underline
+ <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>
diff --cc templates/relay-operations.html
index 4fc7cdf,5482017..31d3af3
--- a/templates/relay-operations.html
+++ b/templates/relay-operations.html
@@@ -1,22 -1,17 +1,25 @@@
<div class="container py-5">
<div class="row py-5">
+<<<<<<< HEAD
++<<<<<<< HEAD
+ <div class="col-8">
+=======
<div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates
++=======
++ <div class="col-lg-7">
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722
{{ this.body }}
</div>
- <div class="col-4 bg-light">
- <p>Illustration area</p>
+ <div class="col-lg-5">
+ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
</div>
</div>
- <div class="row py-5">
+ <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">
- <h4 class="text-primary">.{{ child.key }}</h4>
<h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ child.title }}</a></h4>
<p class="card-text">{{ child.subtitle }}</p>
</div>
diff --cc templates/user-research.html
index e7d4441,3c3ac7b..42f75a0
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@@ -1,16 -1,10 +1,21 @@@
<div class="container py-5">
+<<<<<<< HEAD:templates/user-testing.html
++<<<<<<< HEAD:templates/user-testing.html
+ <h2 class="text-primary">{{ _('Testing Tor features while respecting user privacy') }}</h2>
+ <div class="row py-5">
+ <div class="col-8">
+=======
+ <div class="row pt-5">
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates:templates/user-research.html
++=======
+ <div class="row pt-5">
+ <div class="col-lg-7">
++>>>>>>> 7e19f0a143e8d02075b6e6d6075040c9cf626722:templates/user-research.html
{{ this.body }}
</div>
- <div class="col-4 bg-light">
- <p>Illustration area</p>
+ <div class="col-lg-5">
+ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
</div>
</div>
<h2 class="text-primary"><u>{{ _('Want to know more? Take a look at our process') }}
More information about the tor-commits
mailing list