[tor-commits] [tpo/staging] Fix layout
emmapeel at torproject.org
emmapeel at torproject.org
Wed May 29 07:43:23 UTC 2019
commit bc751d17176a3a3dfa15c98616c78542aecf2f27
Author: hiro <hiro at torproject.org>
Date: Thu Apr 11 00:31:14 2019 +0200
Fix layout
---
templates/contact.html | 22 +++++++++++-----------
templates/download-android.html | 2 +-
templates/download.html | 4 ++--
templates/footer.html | 4 ++--
templates/hero-download.html | 4 ++--
templates/hero-home.html | 2 +-
templates/navbar.html | 2 +-
templates/people.html | 2 +-
templates/press.html | 4 ++--
templates/thank-you.html | 6 +++---
10 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/templates/contact.html b/templates/contact.html
index c9c030c..e80e07c 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-8 py-3">
{% from "macros/contact.html" import render_oftc %}
- <h3 class="text-secondary display-5 mb-4"><i class="fas fa-table-tennis-png text-primary pr-2"></i> {{ _('Chat with us on') }} {{ render_oftc() }}</h3>
+ <h3 class="text-secondary display-5 mb-4"><i class="text-primary pr-2 fas fa-table-tennis-png"></i> {{ _('Chat with us on') }} {{ render_oftc() }}</h3>
<p class="text-tpo"><span class="text-primary nick">#tor</span> - {{ _("Ask questions about using Tor.") }}</p>
<p class="text-tpo"><span class="text-primary nick">#tor-dev</span> - {{ _("Discuss Tor-related coding and protocols. Ideas are welcome.") }}</p>
<p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p>
@@ -17,14 +17,14 @@
<div class="row border-bottom border-light"><p></p></div>
</div>
<div class="col-md-4 py-3">
- <h3 class="text-secondary display-5 mb-4"><i class="fas fa-comments-png text-primary pr-2"></i> {{ _("Find us on Social Media") }}</h3>
+ <h3 class="text-secondary display-5 mb-4"><i class="text-primary pr-2 fas fa-comments-png"></i> {{ _("Find us on Social Media") }}</h3>
<ul class="jobs-ul text-primary">
- <li class="py-2"><i class="fab fa-twitter-png-purple display-5"></i><a class="pl-3" href="https://twitter.com/torproject" title="@torproject" target="_blank">Twitter</a></li>
- <li class="py-2"><i class="fab fa-facebook-png-purple display-5"></i><a class="pl-3" href="https://www.facebook.com/TorProject" title="Tor Project" target="_blank">Facebook</a></li>
- <li class="py-2"><i class="fab fa-linkedin-png-purple display-5"></i><a class="pl-3" href="https://www.linkedin.com/company/tor-project/" title="Tor Project" target="_blank">Linkedin</a></li>
- <li class="py-2"><i class="fab fa-mastodon-png-purple display-5"></i><a class="pl-3" href="https://mastodon.social/@torproject" title="Tor Project" target="_blank">Mastodon</a></li>
- <li class="py-2"><i class="fab fa-instagram-png-purple display-5"></i><a class="pl-3" href="https://www.instagram.com/torproject/" title="@torproject" target="_blank">Instagram</a></li>
- <li class="py-2"><i class="fab fa-youtube-png-purple display-5"></i><a class="pl-3" href="https://www.youtube.com/user/TheTorProject/" title="Tor Project" target="_blank">YouTube</a></li>
+ <li class="py-2"><i class="display-5 fab fa-twitter-png-purple"></i><a class="pl-3" href="https://twitter.com/torproject" title="@torproject" target="_blank">Twitter</a></li>
+ <li class="py-2"><i class="display-5 fab fa-facebook-png-purple"></i><a class="pl-3" href="https://www.facebook.com/TorProject" title="Tor Project" target="_blank">Facebook</a></li>
+ <li class="py-2"><i class="display-5 fab fa-linkedin-png-purple"></i><a class="pl-3" href="https://www.linkedin.com/company/tor-project/" title="Tor Project" target="_blank">Linkedin</a></li>
+ <li class="py-2"><i class="display-5 fab fa-mastodon-png-purple"></i><a class="pl-3" href="https://mastodon.social/@torproject" title="Tor Project" target="_blank">Mastodon</a></li>
+ <li class="py-2"><i class="display-5 fab fa-instagram-png-purple"></i><a class="pl-3" href="https://www.instagram.com/torproject/" title="@torproject" target="_blank">Instagram</a></li>
+ <li class="py-2"><i class="display-5 fab fa-youtube-png-purple"></i><a class="pl-3" href="https://www.youtube.com/user/TheTorProject/" title="Tor Project" target="_blank">YouTube</a></li>
</ul>
</div>
</div>
@@ -54,14 +54,14 @@
<div class="row">
<div class="col-md-6">
<div class="row">
- <div class="oval-3 mt-3"><i class="fas fa-spider-png text-primary"></i></div>
+ <div class="oval-3 mt-3"><i class="text-primary fas fa-spider-png"></i></div>
</div>
<div class="row mt-3 mr-5">
<a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback" target="_blank">{{ _('Report a bug or give feedback.') }}</a>
<p class="text-tpo">{{ _('Tor relies on the support of users and volunteers around the world to help us improve our software and resources, so your feedback is extremely valuable to us (and to all Tor users).') }}</p>
</div>
<div class="row">
- <div class="oval-3 mt-3"><i class="fas fa-flag-png text-primary"></i></div>
+ <div class="oval-3 mt-3"><i class="text-primary fas fa-flag-png"></i></div>
</div>
<div class="row mt-3 mr-5">
<a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays" target="_blank">{{ _('Tell us about a bad relay.') }}</a>
@@ -70,7 +70,7 @@
</div>
<div class="col-md-6">
<div class="row">
- <div class="oval-3 mt-3"><i class="fas fa-lock-png text-primary"></i></div>
+ <div class="oval-3 mt-3"><i class="text-primary fas fa-lock-png"></i></div>
</div>
<div class="row mt-3 mr-5">
<h4 class="text-primary">{{ _('Report a security issue.') }}</h4>
diff --git a/templates/download-android.html b/templates/download-android.html
index 957c4ad..b6ac863 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -4,7 +4,7 @@
<div class="row">
<div class="oval-2 bg-dark mx-auto">
<a href="{{ '/download/#android'|url(alt=this.alt) }}">
- <i class="fab fa-android-png text-light" alt="android" ></i>
+ <i class="text-light fab fa-android-png" alt="android" ></i>
</a>
</div>
</div>
diff --git a/templates/download.html b/templates/download.html
index f35be40..f531275 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -35,7 +35,7 @@
</div>
<div class="container justify-content-center mt-4">
<div class="row justify-content-center">
- <i class="far fa-file-alt-png display-5 text-primary pr-3"></i>
+ <i class="display-5 text-primary pr-3 far fa-file-alt-png"></i>
{% from "macros/downloads.html" import render_tor_browser_manual %}
<p class="text-primary text-tpo pl-2">{{ _('Check out the %s for more troubleshooting tips.')|format(render_tor_browser_manual())|safe }}</p>
</div>
@@ -45,7 +45,7 @@
</div>
<div class="container justify-content-center mt-4">
<div class="row justify-content-center">
- <i class="fas fa-signature-png display-5 text-primary pr-3"></i><p class="text-primary text-tpo">
+ <i class="display-5 text-primary pr-3 fas fa-signature-png"></i><p class="text-primary text-tpo">
<a class="mx-auto pl-2" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p>
</div>
diff --git a/templates/footer.html b/templates/footer.html
index 82d3059..17208ef 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -10,7 +10,7 @@
<p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p>
{% set download = site.get('/download') %}
<a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}">
- {{ _("Download Tor Browser") }}<i class="fas fa-arrow-down-png-purple icon-2 ml-2 pt-1"></i>
+ {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png-purple"></i>
</a>
</div>
</div>
@@ -89,5 +89,5 @@
<script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script>
<script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script>
<script src="{{ '/static/js/download.js'|asseturl }}" ></script>
- <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script>
+ <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script>
</div>
diff --git a/templates/hero-download.html b/templates/hero-download.html
index 071ef4b..e8bf7b5 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -21,7 +21,7 @@
{% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt + '.tar.xz' %}
{% endif %}
<a class="downloadLink" href="{{ download_link }}">
- <i class="fab fa-{{ id }}-png text-light"></i>
+ <i class="text-light fab fa-{{ id }}-png"></i>
</a>
</div>
</div>
@@ -29,7 +29,7 @@
<div class="col-sm-6 col-md-3 py-3">
<div class="oval-2 bg-darker mx-auto">
<a href="#android">
- <i class="fab fa-android-png text-light"></i>
+ <i class="text-light fab fa-android-png"></i>
</a>
</div>
</div>
diff --git a/templates/hero-home.html b/templates/hero-home.html
index dbb9ddf..ba90747 100644
--- a/templates/hero-home.html
+++ b/templates/hero-home.html
@@ -10,6 +10,6 @@
<div class="row col-12 p-5 mx-auto justify-content-center">
{% set download = site.get('/download') %}
<a class="btn btn-lg btn-outline-light" href="{{ this.url_to(download, alt=this.alt) }}">
- {{ _("Download Tor Browser") }}<i class="fas fa-arrow-down-png icon-2 ml-2 pt-1"></i>
+ {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i>
</a>
</div>
diff --git a/templates/navbar.html b/templates/navbar.html
index 496a58a..44d0c05 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -55,7 +55,7 @@
{% set download = site.get('/download') %}
<div class="pull-right">
<a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}">
- {{ _("Download Tor Browser") }}<i class="fas fa-arrow-down-png ml-2 pt-1"></i>
+ {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i>
</a>
</div>
</nav>
diff --git a/templates/people.html b/templates/people.html
index 2444abd..1e0e456 100644
--- a/templates/people.html
+++ b/templates/people.html
@@ -28,7 +28,7 @@
<h4 class="text-primary display-5">{{ _('Join Our Team') }}</h4>
<p class="text-center">{{ _("Even if we aren't hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you're a developer, we welcome you to sign up for our dev mailing list to see what we're up to.") }}</p>
<a class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">
- {{ _("Sign up for tor-dev") }}<i class="fas fa-arrow-right-png ml-3 pt-2"></i>
+ {{ _("Sign up for tor-dev") }}<i class="ml-3 pt-2 fas fa-arrow-right-png"></i>
</a>
</div>
</div>
diff --git a/templates/press.html b/templates/press.html
index 3178ed7..5509b85 100644
--- a/templates/press.html
+++ b/templates/press.html
@@ -4,7 +4,7 @@
<div class="container">
<div class="row">
<div class="col-md-6 py-5">
- <h4 class="text-secondary mb-4"><i class="fas fa-life-ring-png text-primary pr-2"></i> {{ _('Get support') }}</h4>
+ <h4 class="text-secondary mb-4"><i class="text-primary pr-2 fas fa-life-ring-png"></i> {{ _('Get support') }}</h4>
<div class="row pl-3">
<a class="h5 text-primary" href="https://support.torproject.org/" title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support Portal') }}</a>
</div>
@@ -19,7 +19,7 @@
<div class="row border-bottom border-light"><p></p></div>
</div>
<div class="col-md-6 py-5">
- <h4 class="text-secondary mb-4"><i class="fas fa-folder-open-png text-primary pr-2"></i> {{ _('Brand Assets') }}</h4>
+ <h4 class="text-secondary mb-4"><i class="text-primary pr-2 fas fa-folder-open-png"></i> {{ _('Brand Assets') }}</h4>
<div class="row pl-3 text-tpo">
<a class="h5 text-primary" href="https://styleguide.torproject.org/visuals/#assets" title="The Tor Project Brand Assets" target="_blank">{{ _('The Tor Project') }}</a>
</div>
diff --git a/templates/thank-you.html b/templates/thank-you.html
index 58f6767..aea0dc8 100644
--- a/templates/thank-you.html
+++ b/templates/thank-you.html
@@ -9,15 +9,15 @@
<div class="container">
<div class="row">
<div class="col-md-4">
- <i class="fas fa-paper-plane-png text-primary pr-2"></i>
+ <i class="text-primary pr-2 fas fa-paper-plane-png"></i>
<h4><a href="https://newsletter.torproject.org">{{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</a></h4>
</div>
<div class="col-md-4">
- <i class="fas fa-cube-png text-primary pr-2"></i>
+ <i class="text-primary pr-2 fas fa-cube-png"></i>
<h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4>
</div>
<div class="col-md-4">
- <i class="fas fa-hands-helping-png text-primary pr-2"></i>
+ <i class="text-primary pr-2 fas fa-hands-helping-png"></i>
<h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4>
</div>
</div>
More information about the tor-commits
mailing list