minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'test.customwristbands.cz' into customwristbands.cz

Browse Source
This commit is contained in:
peter
2016-04-07 19:47:47 +02:00
parent 509ae17fca 56e2636e6c
commit 25860ae501
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/visitor/cwbs/assets/style.css
Vendored
+2 -1
View File
@@ -109,7 +109,8 @@ img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #fffff
.gallery-image-holder>img {width: 100%; height: 250px; border: 1px solid #414042; border-radius: 50%;} .gallery-image-holder>img {width: 100%; height: 250px; border: 1px solid #414042; border-radius: 50%;}
.gallery-image-holder {margin-bottom: 15px; height: 250px; position: relative; cursor: pointer;} .gallery-image-holder {margin-bottom: 15px; height: 250px; position: relative; cursor: pointer;}
.gallery-image-holder.column:last-child:not(:first-child), .gallery-image-holder.columns:last-child:not(:first-child), .gallery-image-holder.column:last-child:not(:first-child), .gallery-image-holder.columns:last-child:not(:first-child),
.product-category.column:last-child:not(:first-child), .product-category.columns:last-child:not(:first-child) { .product-category.column:last-child:not(:first-child), .product-category.columns:last-child:not(:first-child),
.orbit.footer .column:last-child:not(:first-child), .orbit.footer .columns:last-child:not(:first-child){
float: left; float: left;
} }
.product-category {margin-bottom: 25px;} .product-category {margin-bottom: 25px;}
resources/views/visitor/cwbs/defaultLayout.blade.php
+1 -1
View File
@@ -102,7 +102,7 @@
</footer> </footer>
<div id="binarity"> <div id="binarity">
Vytvořila společnosť <a href="https://www.binarity.cz/"><img src="https://tmp.binarity.cz/small_logo.png" alt="binarity s.r.o. logo" target="_blank">binarity s.r.o.</a> Vytvořila společnost <a target="_blank" href="https://www.binarity.cz/"><img src="https://tmp.binarity.cz/small_logo.png" alt="binarity s.r.o. logo">binarity s.r.o.</a>
</div> </div>
</body> </body>
</html> </html>
resources/views/visitor/cwbs/homepageLayout.blade.php
+1 -1
View File
@@ -164,7 +164,7 @@
</footer> </footer>
<div id="binarity"> <div id="binarity">
Vytvořila společnosť <a href="https://www.binarity.cz/"><img src="https://tmp.binarity.cz/small_logo.png" alt="binarity s.r.o. logo" target="_blank">binarity s.r.o.</a> Vytvořila společnost <a target="_blank" href="https://www.binarity.cz/"><img src="https://tmp.binarity.cz/small_logo.png" alt="binarity s.r.o. logo" target="_blank">binarity s.r.o.</a>
</div> </div>
</body> </body>
</html> </html>
resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php
+9 -3
View File
@@ -7,15 +7,21 @@
</div> </div>
<div class="row text-center assorment-holder"> <div class="row text-center assorment-holder">
@forelse($page->subpages() as $i => $subpage) @forelse($page->subpages() as $i => $subpage)
<div class="column subpages b-invo text-center small-12 medium-6 large-3 left m-b-25" data-img="" data-label="{{$subpage->title}}" data-equalizer-watch> <div class="column subpages text-center small-12 medium-6 large-3 left m-b-25"data-equalizer-watch>
<img class="thumbnail" src="@upload($subpage->title_photo)"> <div class="image-clicker b-invo" data-img="" data-label="{{$subpage->title}}" >
<img class="thumbnail" src="@upload($subpage->title_photo)">
</div>
<h5 class="assortment-h5">{{$subpage->title}}</h5> <h5 class="assortment-h5">{{$subpage->title}}</h5>
{{--<p class="assortment-p">{{$subSubpage->meta_description}}</p>--}} {{--<p class="assortment-p">{{$subSubpage->meta_description}}</p>--}}
<a href="{{route('page.content', ['url' => $subpage->url])}}" <a href="{{route('page.content', ['url' => $subpage->url])}}"
class="assortment-more-btn text-center">- více zde -</a> class="assortment-more-btn text-center">- více zde -</a>
</div> </div>
@empty @empty
@if (!empty($page->title_photo))<img class="thumbnail assortment" src="@upload($page->title_photo)">@endif @if (!empty($page->title_photo))
<div class="image-clicker b-invo" data-img="" data-label="{{$page->title}}" >
<img class="thumbnail assortment" src="@upload($page->title_photo)">
</div>
@endif
@endforelse @endforelse
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="m-b-25 m-t-50 p-lr-50-sm"> <div class="m-b-25 m-t-50 p-lr-50-sm">
resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php
+3 -1
View File
@@ -14,7 +14,9 @@
@if (!empty($subpage->subpages())) @if (!empty($subpage->subpages()))
@foreach($subpage->subpages() as $y => $subSubpage) @foreach($subpage->subpages() as $y => $subSubpage)
<div class="column subpages text-center small-12 medium-6 large-3 left" data-equalizer-watch> <div class="column subpages text-center small-12 medium-6 large-3 left" data-equalizer-watch>
<img class="thumbnail" src="@upload($subSubpage->title_photo)"> <div class="image-clicker b-invo" data-img="" data-label="{{$subpage->title}}" >
<img class="thumbnail" src="@upload($subpage->title_photo)">
</div>
<h5 class="assortment-h5">{{$subSubpage->title}}</h5> <h5 class="assortment-h5">{{$subSubpage->title}}</h5>
{{--<p class="assortment-p">{{$subSubpage->meta_description}}</p>--}} {{--<p class="assortment-p">{{$subSubpage->meta_description}}</p>--}}
<a href="{{route('page.content', ['url' => $subSubpage->url])}}" <a href="{{route('page.content', ['url' => $subSubpage->url])}}"