Merge branch '2021'

This commit is contained in:
Massimo Di Lullo 2020-12-15 18:52:34 -05:00
commit 68e6b8ead1
2 changed files with 24 additions and 26 deletions

View File

@ -34,7 +34,7 @@
<div class="collapse navbar-collapse" id="main-navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="https://globalgamejam.org/2020/jam-sites/montreal-game-jam-éts">Global Game Jam</a>
<a class="nav-link" href="https://globalgamejam.org/2021/jam-sites/montreal-game-jam-online-%C3%A9ts">Global Game Jam</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./../../lang/fr/index.html">Fr</a>
@ -65,9 +65,9 @@
<header class="business-header splash-screen">
<div class="row justify-content-center align-items-center">
<div class="col-sm-10 col-md-8 col-lg-4 col-xl-3 title-splash-screen">
<h1>Montreal Game Jam 2020</h1>
<h6>January 31 - February 02 | ÉTS</h6>
<a class="btn btn-info" href="https://www.eventbrite.com/e/montreal-game-jam-2020-tickets-78248353933">Buy Ticket</a>
<h1>Montreal Game Jam 2021</h1>
<h6>27 Janvier - 31 Janvier</h6>
<a class="btn btn-info" href="https://globalgamejam.org/2021/jam-sites/montreal-game-jam-online-%C3%A9ts">Register here</a>
</div>
</div>
</header>
@ -94,9 +94,8 @@
<p class="text-justify">Whether the participants are from the universities or the industry, they will bond during the Jam. Innovative games and interesting mechanics are developed over the weekend and it is up to you to promote this! We want you to have a lot of fun and do what you love most: create games!</p>
</div>
</section>
<section class="row justify-content-center align-items-center">
<!-- <section class="row justify-content-center align-items-center">
<div class="col-xs-12 content-section justify-content-center">
<!-- Use cards to insert icons showing what we offer -->
<h2 class="title-center">We Offer</h2>
<div class="card-deck">
<div class="card justify-content-center align-items-center">
@ -149,7 +148,7 @@
</div>
</div>
</div>
</section>
</section> -->
<section class="row justify-content-center align-items-center flex-sm-wrap-reverse">
<div class="col-lg-8 col-md-6 col-sm-12 iframe-container">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2796.7714986648652!2d-73.56443468444153!3d45.49454597910131!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc91a60aa839707%3A0xb732a719a45c45f6!2s%C3%89cole+de+technologie+sup%C3%A9rieure+%C3%89TS!5e0!3m2!1sen!2sca!4v1558025285765!5m2!1sen!2sca" width="800" height="540" frameborder="0" style="border:0" allowfullscreen></iframe>
@ -157,14 +156,14 @@
<div class="col-lg-4 col-md-6 col-sm-12 content-section">
<h2>Location</h2>
<address>
<b>École de technologie supérieure ÉTS</b><br/>
1100 Notre-Dame St W, Montreal, QC H3C 1K3
<b>Online<!-- École de technologie supérieure ÉTS --></b><br/>
<!-- 1100 Notre-Dame St W, Montreal, QC H3C 1K3 -->
</address>
<br/>
<h2>When</h2>
<p>January 31 - February 02, 2020</p>
<h5>Friday</h5>
<p>Opens : 15h00</p>
<p>January 27 - January 31, 2020</p>
<h5>Wednesday</h5>
<p>Opens : 17h00</p>
<h5>Sunday</h5>
<p>Closes : 19h00</p>
</div>
@ -174,7 +173,7 @@
<footer class="container-fluid">
<div class="row">
<div class="col-lg-12">
<p>Copyright &copy; Montréal Game Jam 2020</p>
<p>Copyright &copy; Montréal Game Jam 2021</p>
</div>
</div>
</footer>

View File

@ -34,7 +34,7 @@
<div class="collapse navbar-collapse" id="main-navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="https://globalgamejam.org/2020/jam-sites/montreal-game-jam-éts">Global Game Jam</a>
<a class="nav-link" href="https://globalgamejam.org/2021/jam-sites/montreal-game-jam-online-%C3%A9ts">Global Game Jam</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./../../lang/en/index.html">En</a>
@ -65,9 +65,9 @@
<header class="business-header splash-screen">
<div class="row justify-content-center align-items-center">
<div class="col-sm-10 col-md-8 col-lg-4 col-xl-3 title-splash-screen">
<h1>Montréal Game Jam 2020</h1>
<h6>31 Janvier - 02 Février | ÉTS</h6>
<a class="btn btn-info" href="https://www.eventbrite.com/e/montreal-game-jam-2020-tickets-78248353933">Achetez un billet</a>
<h1>Montréal Game Jam 2021</h1>
<h6>27 Janvier - 31 Janvier</h6>
<a class="btn btn-info" href="https://globalgamejam.org/2021/jam-sites/montreal-game-jam-online-%C3%A9ts">Enregistrez-vous ici</a>
</div>
</div>
</header>
@ -94,9 +94,8 @@
<p class="text-justify">Que les participants soient à l'université ou de l'industrie, lévénement offre la possibilité de briser cette barrière et ainsi collaborer. Nous voulons surtout que vous ayez du plaisir à accomplir ce défi et réaliser ce qui vous passionne!</p>
</div>
</section>
<section class="row justify-content-center align-items-center">
<!-- <section class="row justify-content-center align-items-center">
<div class="col-xs-12 content-section justify-content-center">
<!-- Use cards to insert icons showing what we offer -->
<h2 class="title-center">Nous offrons</h2>
<div class="card-deck">
<div class="card justify-content-center align-items-center">
@ -149,7 +148,7 @@
</div>
</div>
</div>
</section>
</section> -->
<section class="row justify-content-center align-items-center flex-sm-wrap-reverse">
<div class="col-lg-8 col-md-6 col-sm-12 iframe-container">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2796.7714986648652!2d-73.56443468444153!3d45.49454597910131!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc91a60aa839707%3A0xb732a719a45c45f6!2s%C3%89cole+de+technologie+sup%C3%A9rieure+%C3%89TS!5e0!3m2!1sen!2sca!4v1558025285765!5m2!1sen!2sca" width="800" height="540" frameborder="0" style="border:0" allowfullscreen></iframe>
@ -157,14 +156,14 @@
<div class="col-lg-4 col-md-6 col-sm-12 content-section">
<h2>Emplacement</h2>
<address>
<b>École de technologie supérieure ÉTS</b><br/>
1100 Notre-Dame St W, Montreal, QC H3C 1K3
<b>En ligne<!-- École de technologie supérieure ÉTS --></b><br/>
<!-- 1100 Notre-Dame St W, Montreal, QC H3C 1K3 -->
</address>
<br/>
<h2>Quand</h2>
<p>31 Janvier - 02 Février, 2020</p>
<h5>Vendredi</h5>
<p>Ouvre : 15h00</p>
<p>27 Janvier - 31 Février, 2021</p>
<h5>Mercredi</h5>
<p>Ouvre : 17h00</p>
<h5>Sunday</h5>
<p>Ferme : 19h00</p>
</div>
@ -174,7 +173,7 @@
<footer class="container-fluid">
<div class="row">
<div class="col-lg-12">
<p>Copyright &copy; Montréal Game Jam 2020</p>
<p>Copyright &copy; Montréal Game Jam 2021</p>
</div>
</div>
</footer>