Skip to content

Commit

Permalink
fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
murych committed Dec 13, 2016
2 parents 582c15e + a55e609 commit e144920
Showing 1 changed file with 48 additions and 47 deletions.
95 changes: 48 additions & 47 deletions lambdaweb/templates/blocks/block_footer.html
Original file line number Diff line number Diff line change
@@ -1,52 +1,53 @@
<!-- SOCIAL FOOTER -->
<div id="sf">
<div class="container">
<div class="row">
<div class="col-lg-4 dg">
<h4 class="ml">VK</h4>
<p class="centered">
<a href="https://vk.com/lambdafrela"><i class="fa fa-vk"></i></a></p>
<p class="ml">> Follow Us</p>
</div>
<div class="col-lg-4 lg">
<h4 class="ml">GITHUB</h4>
<p class="centered"><a href="https://github.com/lambdafrela"><i class="fa fa-github"></i></a></p>
<p class="ml">> Fork Us</p>
</div>
<div class="col-lg-4 dg">
<h4 class="ml">SLACK</h4>
<p class="centered"><a href="https://goo.gl/qHQ2vf"><i class="fa fa-slack"></i></a></p>
<p class="ml">> Chat To Us</p>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-4 dg">
<h4 class="ml">VK</h4>
<p class="centered">
<a href="https://vk.com/lambdafrela"><i class="fa fa-vk"></i></a></p>
<p class="ml">> Follow Us</p>
</div>
<div class="col-lg-4 lg">
<h4 class="ml">GITHUB</h4>
<p class="centered"><a href="https://github.com/lambdafrela"><i class="fa fa-github"></i></a></p>
<p class="ml">> Fork Us</p>
</div>
<div class="col-lg-4 dg">
<h4 class="ml">SLACK</h4>
<p class="centered"><a href="https://goo.gl/qHQ2vf"><i class="fa fa-slack"></i></a></p>
<p class="ml">> Chat With Us</p>
</div>
</div>
</div>
</div>

<!-- CONTACT FOOTER -->
<div id="cf">
<div class="container">
<div class="row">
<div class="col-lg-8">
<div id="mapwrap">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2241.980588614794!2d37.49686361573025!3d55.81093738056895!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46b54837dc21e865%3A0x47049bf0a967fbda!2z0JTQmtC40KIg0JzQkNCY!5e0!3m2!1sen!2sru!4v1481646733124" width="100%" height="400" frameborder="0" style="border:0" allowfullscreen></iframe>
</div>
</div>
<div class="col-lg-4">
<h4>Как нас найти?</h4>
<br>
<p>
Понедельник/среда<br/>
17:00 - 20:00
</p>
<p>
ДКиТ МАИ, 208<br/>
Москва, Россия.
</p>
<p>
{# P: +55 4839-4390<br/>#}
E: <a href="mailto:#">[email protected]</a>
</p>
</div>
</div>
</div>
</div>
<div id="cf">
<div class="container">
<div class="row">
<div class="col-lg-8">
<div id="mapwrap">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2241.980588614794!2d37.49686361573025!3d55.81093738056895!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46b54837dc21e865%3A0x47049bf0a967fbda!2z0JTQmtC40KIg0JzQkNCY!5e0!3m2!1sen!2sru!4v1481646733124"
width="100%" height="400" frameborder="0" style="border:0" allowfullscreen></iframe>
</div>
</div>
<div class="col-lg-4">
<h4>Как нас найти?</h4>
<br>
<p>
Понедельник/среда<br/>
17:00 - 20:00
</p>
<p>
ДКиТ МАИ, 208<br/>
Москва, Россия.
</p>
<p>
{# P: +55 4839-4390<br/>#}
E: <a href="mailto:#">[email protected]</a>
</p>
</div>
</div>
</div>
</div>

0 comments on commit e144920

Please sign in to comment.