resolve conflicts

This commit is contained in:
akcodez
2023-06-08 14:39:21 -07:00
parent da596c76e4
commit 869a0ddcfc

View File

@@ -91,16 +91,16 @@
<div class="px-lg-3 pb-3">
<img id="benefits-01" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Exclusive Opportunities</h6>
<p class="">Get access and invitations to Ambassador-only events, conferences, and opportunities</p>
<h6 class="mb-3">{% trans %}Exclusive Opportunities{% endtrans %}</h6>
<p>{% trans %} Get access and invitations to Ambassador-only events, conferences, and opportunities{% endtrans %}</p>
</div>
</div>
<!-- Hide on large -->
<div class="px-lg-3 pb-3 d-lg-none ">
<img id="benefits-02" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Education</h6>
<p class="">Tutorials and workshops from leading XRPL and blockchain developers</p>
<h6 class="mb-3">{% trans %}Education{% endtrans %}</h6>
<p >{% trans %}Tutorials and workshops from leading XRPL and blockchain developers{% endtrans %}</p>
</div>
</div>
@@ -108,7 +108,7 @@
<img id="benefits-03" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Swag</h6>
<p class="">New XRPL swag for Ambassadors and swag to share with other students</p>
<p >{% trans %}New XRPL swag for Ambassadors and swag to share with other students{% endtrans %}</p>
</div>
</div>
@@ -117,7 +117,7 @@
<img id="benefits-04" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Mentorship</h6>
<p class="">Serve as an advocate and receive support from notable members of the community</p>
<p>{% trans %}Serve as an advocate and receive support from notable members of the community{% endtrans %}</p>
</div>
</div>
@@ -125,7 +125,7 @@
<img id="benefits-05" class="pl-lg-3">
<div class="p-lg-3 pt-3 pb-lg-0">
<h6 class="mb-3">Career Acceleration</h6>
<p class="pb-lg-0">Gain hands-on experience building communities and grow your professional network in the blockchain industry</p>
<p class="pb-lg-0">{% trans %}Gain hands-on experience building communities and grow your professional network in the blockchain industry{% endtrans %}</p>
</div>
</div>
@@ -148,7 +148,7 @@
<img id="benefits-02" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Education</h6>
<p class="">Tutorials and workshops from leading XRPL and blockchain developers</p>
<p >Tutorials and workshops from leading XRPL and blockchain developers</p>
</div>
</div>
@@ -156,7 +156,7 @@
<img id="benefits-04" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Mentorship</h6>
<p class="">Serve as an advocate and receive support from notable members of the community</p>
<p >Serve as an advocate and receive support from notable members of the community</p>
</div>
</div>
@@ -200,7 +200,7 @@
<img id="eligibility-01" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">A Leader</h6>
<p class="">Interested in leading meetups and workshops for your local campus community</p>
<p >Interested in leading meetups and workshops for your local campus community</p>
</div>
</div>
@@ -209,7 +209,7 @@
<img id="eligibility-02" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Active</h6>
<p class="">An active participant in the XRPL community or interested in blockchain and crypto technologies</p>
<p >An active participant in the XRPL community or interested in blockchain and crypto technologies</p>
</div>
</div>
@@ -217,7 +217,7 @@
<img id="eligibility-03" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Curious</h6>
<p class="">Eager to learn more about technical blockchain topics and the XRPL</p>
<p >Eager to learn more about technical blockchain topics and the XRPL</p>
</div>
</div>
@@ -226,7 +226,7 @@
<img id="eligibility-04" class="pl-lg-3">
<div class="p-lg-3 pt-3 pb-lg-0">
<h6 class="mb-3">Passionate</h6>
<p class="">Passionate about increasing XRPL education and awareness through events, content, and classroom engagement</p>
<p >Passionate about increasing XRPL education and awareness through events, content, and classroom engagement</p>
</div>
</div>
@@ -248,14 +248,14 @@
<img id="eligibility-02" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Active</h6>
<p class="">An active participant in the XRPL community or interested in blockchain and crypto technologies</p>
<p >An active participant in the XRPL community or interested in blockchain and crypto technologies</p>
</div>
</div>
<div class="px-lg-3 pb-3 ">
<img id="eligibility-04" class="pl-lg-3">
<div class="p-lg-3 pt-3 pb-lg-0">
<h6 class="mb-3">Passionate</h6>
<p class="">Passionate about increasing XRPL education and awareness through events, content, and classroom engagement</p>
<p >Passionate about increasing XRPL education and awareness through events, content, and classroom engagement</p>
</div>
</div>
@@ -277,8 +277,8 @@
<div class="carousel-item active">
<div class="p-0">
<div class="mb-4 p-lg-3">
<img src="./assets/img/ambassadors/quote1-small.svg" class="h-100 d-lg-none mb-4">
<img src="./assets/img/ambassadors/quote1.svg" class="h-100 d-none d-lg-block">
<img alt="quote-1-small" src="./assets/img/ambassadors/quote1-small.svg" class="h-100 d-lg-none mb-4">
<img alt="quote-1-big" src="./assets/img/ambassadors/quote1.svg" class="h-100 d-none d-lg-block">
<div class="p-0 col-lg-7 mx-lg-auto">
<p class="p-lg-3 mb-2"><strong>Derrick N.</strong><br >
Toronto Metropolitan University<br >
@@ -291,8 +291,8 @@
<div class="carousel-item mb-20">
<div class="p-0">
<div class="mb-4 p-lg-3">
<img src="./assets/img/ambassadors/quote2-small.svg" class="h-150 d-lg-none mb-4">
<img src="./assets/img/ambassadors/quote2.svg" class="h-100 d-none d-lg-block">
<img alt="quote-2-small" src="./assets/img/ambassadors/quote2-small.svg" class="h-150 d-lg-none mb-4">
<img alt="quote-2-small" src="./assets/img/ambassadors/quote2.svg" class="h-100 d-none d-lg-block">
<div class="p-0 col-lg-7 mx-lg-auto">
<p class="p-lg-3 mb-2"><strong>Sally Z.</strong><br >
Toronto Metropolitan University<br >
@@ -305,8 +305,8 @@
<div class="carousel-item mb-40">
<div class="p-0">
<div class="mb-4 p-lg-3">
<img src="./assets/img/ambassadors/quote3-small.svg" class="h-150 d-lg-none mb-4">
<img src="./assets/img/ambassadors/quote3.svg" class="h-100 d-none d-lg-block">
<img alt="quote-3-small" src="./assets/img/ambassadors/quote3-small.svg" class="h-150 d-lg-none mb-4">
<img alt="quote-3-big" src="./assets/img/ambassadors/quote3.svg" class="h-100 d-none d-lg-block">
<div class="p-0 col-lg-7 mx-lg-auto">
<p class="p-lg-3 mb-2"><strong>Nick D.</strong><br >
Miami University<br >
@@ -349,10 +349,10 @@
<div class="col-12 col-lg-6 p-0 pr-lg-4">
<div class="px-lg-3 pb-3">
<img src="./assets/img/ambassadors/01.svg" class="pl-lg-3">
<img alt="group-photo" src="./assets/img/ambassadors/01.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Apply</h6>
<p class="">Submit an application to be considered for the Campus Ambassador program.</p>
<h6 class="mb-3">{% trans %}Apply{% endtrans %}</h6>
<p >{% trans %}Submit an application to be considered for the Campus Ambassador program.{% endtrans %}</p>
</div>
</div>
@@ -360,16 +360,16 @@
<div class="px-lg-3 pb-3 d-lg-none ">
<img src="./assets/img/ambassadors/02.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Interview</h6>
<p class="">Tell the XRPL community-led panel more about yourself and your interest in the program during an interview.</p>
<h6 class="mb-3">{% trans %}Interview{% endtrans %}</h6>
<p >{% trans %}Tell the XRPL community-led panel more about yourself and your interest in the program during an interview.{% endtrans %}</p>
</div>
</div>
<div class="px-lg-3 pb-3">
<img src="./assets/img/ambassadors/03.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Join</h6>
<p class="">Congrats on your new role! Join the global cohort of Ambassadors and meet with community participants during onboarding.</p>
<h6 class="mb-3">{% trans %}Join{% endtrans %}</h6>
<p >{% trans %}Congrats on your new role! Join the global cohort of Ambassadors and meet with community participants during onboarding.{% endtrans %}</p>
</div>
</div>
@@ -377,8 +377,8 @@
<div class="p-lg-3 pb-3 d-lg-none">
<img src="./assets/img/ambassadors/04.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Learn</h6>
<p class="">Participate in personalized learning and training sessions for Ambassadors on the XRPL and blockchain technology.</p>
<h6 class="mb-3">{% trans %}Learn{% endtrans %}</h6>
<p> {% trans %}Participate in personalized learning and training sessions for Ambassadors on the XRPL and blockchain technology.{% endtrans %}</p>
</div>
</div>
</div>
@@ -390,15 +390,15 @@
<div class="px-lg-3 pb-3 mt-5">
<img src="./assets/img/ambassadors/02.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3">
<h6 class="mb-3">Interview</h6>
<p class="">Tell the XRPL community-led panel more about yourself and your interest in the program during an interview.</p>
<h6 class="mb-3">{% trans %}Interview{% endtrans %}</h6>
<p >{% trans %}Tell the XRPL community-led panel more about yourself and your interest in the program during an interview.{% endtrans %}</p>
</div>
</div>
<div class="p-lg-3 pb-3 ">
<img src="./assets/img/ambassadors/04.svg" class="pl-lg-3">
<div class="p-lg-3 pt-3 pb-lg-0">
<h6 class="mb-3">Learn</h6>
<p class="pb-lg-0">Participate in personalized learning and training sessions for Ambassadors on the XRPL and blockchain technology.</p>
<h6 class="mb-3">{% trans %}Learn{% endtrans %}</h6>
<p class="pb-lg-0">{% trans %}Participate in personalized learning and training sessions for Ambassadors on the XRPL and blockchain technology.{% endtrans %}</p>
</div>
</div>
@@ -411,22 +411,21 @@
<div class="d-lg-none order-3 mt-4 pt-3">
<button data-tf-popup="rTioxhMY" data-tf-iframe-props="title=XRPL Campus Ambassador" data-tf-medium="snippet"
class="btn btn-primary btn-arrow-out"
data-tf-hidden="utm_source=xxxxx,utm_medium=xxxxx,utm_campaign=xxxxx,utm_term=xxxxx,utm_content=xxxxx">Apply for Fall 2023</button>
data-tf-hidden="utm_source=xxxxx,utm_medium=xxxxx,utm_campaign=xxxxx,utm_term=xxxxx,utm_content=xxxxx">{% trans %}Apply for Fall 2023{% endtrans %}</button>
</div>
</div>
</section>
<!-- Image Block -->
<div class="">
<img src="./assets/img/ambassadors/students-large.png" alt="Stylized collage of photos from XRP Ledger events" class="w-100">
<div >
<img src="./assets/img/ambassadors/students-large.png" class="w-100">
</div>
<!-- Global Community Carousel -->
<section class="container-new pt-26">
<div class="p-0 col-lg-5">
<div class="d-flex flex-column-reverse p-lg-3">
<h3 class="h4 h2-sm">{% trans %}Join a global cohort of Student Ambassadors{% endtrans %}</h3>
@@ -474,16 +473,16 @@
<div class="p-lg-3 mb-3 pb-3">
<img src="./assets/img/ambassadors/icon_meetup.svg" class="mb-3">
<div class="">
<div >
<h6 class="mb-3"><a class="btn-arrow" href="https://www.meetup.com/pro/xrpl-community/">MeetUp</a></h6>
<p class="">Attend an XRPL Meetup in your local area</p>
<p >{% trans %}Attend an XRPL Meetup in your local area{% endtrans %}</p>
</div>
</div>
<div class="p-lg-3 mb-3 pb-3">
<img src="./assets/img/ambassadors/icon_devto.svg" class="mb-3">
<div class="">
<div >
<h6 class="mb-3"><a class="btn-arrow" href="https://dev.to/t/xrpl">Dev.to Blog</a></h6>
<p class="">Read more about the activity of the XRPL Ambassadors</p>
<p >{% trans %}Read more about the activity of the XRPL Ambassadors{% endtrans %}</p>
</div>
</div>
@@ -493,9 +492,9 @@
<div class="p-lg-3 mb-3 pb-3 ">
<img src="./assets/img/ambassadors/icon_discord.svg" class="mb-3">
<div class="">
<div >
<h6 class="mb-3"><a class="btn-arrow" href="https://xrpldevs.org">Discord</a></h6>
<p class="">Join the conversation on the XRPL Developer Discord</p>
<p >{% trans %}Join the conversation on the XRPL Developer Discord{% endtrans %}</p>
</div>
</div>