Merge branch '1.1' of https://github.com/merdiano/orient-site into 1.1
This commit is contained in:
commit
63245ef9a0
|
|
@ -79,6 +79,9 @@ random = 0
|
||||||
<div class="main__body">
|
<div class="main__body">
|
||||||
<div class="main__body-row">
|
<div class="main__body-row">
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
|
<div class="banner__mobile">
|
||||||
|
{% component 'right_top' css_class= 'main__sidebar-adv' %}
|
||||||
|
</div>
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -88,6 +91,9 @@ random = 0
|
||||||
<div class="main__body">
|
<div class="main__body">
|
||||||
<div class="main__body-row">
|
<div class="main__body-row">
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
|
<div class="banner__mobile">
|
||||||
|
{% component 'right_middle' css_class = 'main__sidebar-adv' %}
|
||||||
|
</div>
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -97,13 +103,16 @@ random = 0
|
||||||
<div class="main__body">
|
<div class="main__body">
|
||||||
<div class="main__body-row">
|
<div class="main__body-row">
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
|
<div class="banner__mobile">
|
||||||
|
{% component 'right_bottom' css_class= 'main__sidebar-adv' %}
|
||||||
|
</div>
|
||||||
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
{% partial 'index/category_posts' category = blogCategories.categories.shift %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="main__banner">
|
<div class="main__banner">
|
||||||
{% component 'adv_center_5' %}
|
{% component 'adv_center_5' %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="main__sidebar">
|
<div class="main__sidebar">
|
||||||
{% partial 'sidebar__cards' %}
|
{% partial 'sidebar__cards' %}
|
||||||
|
|
@ -117,4 +126,4 @@ random = 0
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<!-- main end
|
<!-- main end
|
||||||
================================================ -->
|
================================================ -->
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,12 @@ postPage = "post"
|
||||||
==
|
==
|
||||||
<div class="marquee__outer">
|
<div class="marquee__outer">
|
||||||
<a href="#" class="marquee__link">
|
<a href="#" class="marquee__link">
|
||||||
Главное
|
{{'Главное'|_}}
|
||||||
</a>
|
</a>
|
||||||
<div class="marquee">
|
<div class="marquee">
|
||||||
{% for post in posts %}
|
{% for post in posts %}
|
||||||
<div class="marquee__item">
|
<div class="marquee__item">
|
||||||
<a href="#">{{post.title}}</a>
|
<a href="{{post.url}}">{{post.title}}</a>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -101,4 +101,4 @@ postPage = "post"
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue