Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tomislav R 2016-04-10 08:42:33 +02:00
commit e73d50be19

View file

@ -2,31 +2,11 @@
{% load staticfiles cms_tags %}
{% block content %}
<div class="row">
<div class="box">
{% placeholder 'digitalglarus_gallery' %}
<div class="col-lg-12 text-center">
<div id="carousel-example-generic" class="carousel slide">
<!-- Indicators --><!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
</div>
<div class="item">
<img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
</div>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="icon-next"></span>
</a>
</div>
<h2 class="brand-before">
<small>WELCOME TO</small>
</h2>
@ -96,4 +76,4 @@
</div>
</div>
{% endblock %}
{% endblock %}