merged code from main branch, fixed merged conflict

This commit is contained in:
Calvin Jhunjhnuwala
2020-08-31 14:05:10 -07:00
14 changed files with 2722 additions and 272 deletions

View File

@@ -27,7 +27,7 @@
<h2 class="mt-12 mb-10">{% trans %}The digital asset XRP is a truly global currency—ideally suited to enable todays global economy.{% endtrans %}</h2>
<p>{% trans %}As an optimal medium of exchange, XRP and the XRP Ledger on which it operates help to move money around the world faster, cheaper and more sustainably than any other currency available today.{% endtrans %}</p>
<p class="mb-10">{% trans %}It was designed this way, and its proving its impact in global payments and beyond.{% endtrans %}</p>
<a href="#" class="arrow-link text-white bold">{% trans %}How Green Is Your Currency?{% endtrans %}</a>
<a href="carbon-calculator.html" class="arrow-link text-white bold">{% trans %}How Green Is Your Currency?{% endtrans %}</a>
</div>
</section>
</div>
@@ -42,7 +42,7 @@
</div>
<div class="col-md-6 offset-md-1">
<h2 class="mb-10">{% trans %}Democratizing Global Payments{% endtrans %}</h2>
<h5 class="mb-10 normal">{% trans %}For the more than <a href="#">272 million migrants</a> worldwide, sending and receiving money across borders is expensive, unreliable and complex.{% endtrans %}</h5>
<h5 class="mb-10 normal">{% trans %}For the more than <a href="https://www.un.org/sites/un2.un.org/files/wmr_2020.pdf">272 million migrants</a> worldwide, sending and receiving money across borders is expensive, unreliable and complex.{% endtrans %}</h5>
<div class="mb-10 row">
<div class="col-md">
<p>{% trans %}XRP and the XRP Ledger are changing that.{% endtrans %}</p>
@@ -53,7 +53,7 @@
<a href="#" class="btn btn-clear">{% trans %}Learn More{% endtrans %}</a>
</div>
</section>
<section class="row mb-50">
<h6 class="section-marker">{% trans %}Future of Finance{% endtrans %}</h6>
<div class="col-md-4 offset-md-1 order-1 order-md-2 mb-10 text-center">
@@ -106,7 +106,7 @@
<p>{% trans %}Adopting XRP more broadly will help limit this waste and ensure a sustainable future for our planet and global economy.{% endtrans %}</p>
</div>
</div>
<a href="/carbon-calculator.html" class="btn btn-clear">{% trans %}Discover the Green Currency Calculator{% endtrans %}</a>
<a href="carbon-calculator.html" class="btn btn-clear">{% trans %}Discover the Green Currency Calculator{% endtrans %}</a>
</div>
</section>
</div>