[tor-commits] [tpo/staging] Fix merge conflicts
hiro at torproject.org
hiro at torproject.org
Tue Jan 8 15:12:03 UTC 2019
commit 789e5790c5e92eb6ab44e2eafc3ce63dc7d47151
Merge: 3a7ab1a b8382a4
Author: hiro <hiro at torproject.org>
Date: Tue Jan 8 16:11:49 2019 +0100
Fix merge conflicts
.gitignore | 5 +-
assets/scss/_portal.scss | 10 +--
assets/scss/_tpo.scss | 34 +++++-----
assets/static/images/circle-pattern.png | Bin 0 -> 556240 bytes
assets/static/images/circle-pattern.svg | 106 ++++++++++++++++++++++++++++++++
content/about/contents+es.lr | 3 -
content/about/history/contents+es.lr | 15 -----
content/about/jobs/contents+es.lr | 1 -
i18n/contents.pot | 2 +-
templates/footer.html | 4 +-
templates/header.html | 4 +-
templates/hero-download.html | 10 +--
templates/hero-home.html | 8 +--
13 files changed, 148 insertions(+), 54 deletions(-)
diff --cc .gitignore
index 5dc82fe,5dc82fe..2baf5c4
--- a/.gitignore
+++ b/.gitignore
@@@ -5,11 -5,11 +5,14 @@@ node_module
public
++contents+*.lr
++
*.egg-info
*.pyc
__pycache__
--i18n/compiled
++### Lektor Temps ###
++*~*
### Emacs ###
# -*- mode: gitignore; -*-
diff --cc i18n/contents.pot
index 23d7e97,8ed1e3d..49ba97c
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@@ -2,7 -2,7 +2,7 @@@ msgid "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2018-12-17 15:38+CET\n"
-"POT-Creation-Date: 2018-12-12 23:30+CET\n"
++"POT-Creation-Date: 2018-12-19 13:51+CET\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: en <LL at li.org>\n"
diff --cc templates/footer.html
index fd46bf5,e05ee23..fd3771e
--- a/templates/footer.html
+++ b/templates/footer.html
@@@ -1,12 -1,11 +1,12 @@@
<div class="container-fluid bg-dark footer">
<div class="row">
<div class="col-12 d-flex justify-content-right">
- <div class="container pt-5 justify-content-right">
+ <div class="container pt-5 justify-content-right onion-bg">
<div class="offset-lx-2 offset-sm-4 mt-5">
- <h3 class="text-white text-bold">Download Tor Browser</h3>
+ <h2 class="text-white text-bold">Download Tor Browser</h2>
<p class="text-white">Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.</p>
- <a class="btn text-primary bg-white btn-light pull-right mt-2" href="https://www.torproject.org/download/download-easy.html.en">
+ {% set download = site.get('/download') %}
+ <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download) }}">
{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
</a>
</div>
diff --cc templates/hero-download.html
index 6a4a059,0000000..6867d35
mode 100644,000000..100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@@ -1,38 -1,0 +1,38 @@@
- <div class="row pt-5">
++<div class="row">
+ <h1 class="mx-auto display-2 text-white">Defend yourself.</h1>
+</div>
- <div class="row pt-5">
- <h4 class="mx-auto defend text-white">Protect yourself against tracking, surveillance, and censorship. </h1>
++<div class="row">
++ <h1 class="mx-auto defend text-white">Protect yourself against tracking, surveillance, and censorship. </h1>
+</div>
+<div class="row col-12 p-5 mx-auto justify-content-center">
- <form>
++ <form action="/download/torbrowser" method="get">
+ <div class="form-group row">
+ <div class="col-3 dropdown-select">
+ <select id="platforms" class="form-control btn btn-dark bg-dark border-0 border-white border-active">
+ {% for id, item in bag('platforms+' + this.alt).items() %}
+ <option id="{{ id }}" data-style="btn btn-dark bg-dark">{{ item.label }}</option>
+ {% endfor %}
+ </select>
+ </div>
+ <div class="col-3 dropdown-select">
+ <select class="form-control btn btn-dark bg-dark border-0 border-white border-active">
+ <span class="oi oi-chevron-bottom"></span>
+ {% for id, item in bag('alternatives').items() %}
+ {% if this.alt != id %}
+ <option data-style="btn btn-dark bg-dark">{{ item.language }}</option>
+ {% endif %}
+ {% endfor %}
+ </select>
+ </div>
+ <div class="col-6">
+ <button type="submit" class="btn btn-shadow text-white bg-dark">{{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span></button>
+ </div>
+ </div>
+ </form>
+</div>
- <div class="row pt-5">
++<div class="row">
+ <a class="mx-auto text-white p-5 fade" href=""><u>Read the latest release announcements.</u></a>
+</div>
+<div class="row pt-5 justify-content-center">
+ <img src="{{ 'static/images/png/Group4.png'|asseturl }}" />
+</div>
diff --cc templates/hero-home.html
index f9de83c,0000000..666433d
mode 100644,000000..100644
--- a/templates/hero-home.html
+++ b/templates/hero-home.html
@@@ -1,15 -1,0 +1,15 @@@
- <div class="row pt-5">
++<div class="row">
+ <h1 class="mx-auto display-2 text-white">Browse Privately.</h1>
+</div>
- <div class="row pt-5">
++<div class="row">
+ <h1 class="mx-auto display-2 text-white">Explore Freely.</h1>
+</div>
- <div class="row pt-5">
- <h4 class="mx-auto defend text-white">Defend yourself against tracking and surveillance. Circumnvent censorship.</h1>
++<div class="row">
++ <h1 class="mx-auto defend text-white">Defend yourself against tracking and surveillance. Circumnvent censorship.</h1>
+</div>
+<div class="row col-12 p-5 mx-auto justify-content-center">
+ {% set download = site.get('/download') %}
+ <a class="btn btn-lg btn-shadow text-white bg-dark" href="{{ this.url_to(download) }}">
+ {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span>
+ </a>
+</div>
More information about the tor-commits
mailing list