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

Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-04-06 18:02:25 +02:00
parent 543cce17fa 2f7a3790b9
commit dcce436c59
6 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/visitor/cwbs/assets/style.css
Vendored
+5 -3
View File
@@ -90,7 +90,8 @@ hr {border-bottom: 0;width: 5%; margin: 0 auto; position: relative; top: -15px;
.assortment-h5 {text-align: center; text-transform: uppercase; font-weight: 500; font-size: 1.1rem;}
.assortment-p {font-size: 0.8rem; text-align: center; margin: 15px auto 10px; width: 50%;}
.assortment-more-btn {color: #46c1be; text-transform: uppercase; font-style: italic; text-align: center; font-size: 0.85rem; width: 100%; display: inline-block; font-weight: 500;}
img.thumbnail {border-radius: 50%; box-shadow: none; border-width: 2px; border-color: #ffffff;}
img.thumbnail {border-radius: 50%; width: 100%; height: 250px; box-shadow: none; border-width: 2px; border-color: #ffffff;}
img.thumbnail.assortment {width: 250px;}
img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #ffffff;}
.sale-image-holder>img {width: 100%; height: auto; border: 1px solid #414042;}
@@ -144,7 +145,8 @@ img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #fffff
footer {padding-top: 50px;}
footer .menu {display: inline-block;}
footer a {color: #414042; font-weight: 500;}
footer a:hover {color: #46c1be;}
.footer-info * {color: #414042 !important;}
footer a:hover {color: #46c1be !important;}
.social-icons .fa-stack-2x {color: #46c1be;}
.social-icons a:hover .fa-stack-2x {color: #414042;}
.social-icons .fa.w-t {color: #ffffff;}
@@ -166,7 +168,7 @@ footer a:hover {color: #46c1be;}
.assortment-h5 {text-align: left; margin-left: 175px; font-size: 1.0rem;}
.assortment-p {text-align: left; margin-left: 175px; font-size: 0.75rem; width: 100%;}
.assortment-more-btn {text-align: left; margin-left: 175px; display: block;}
img.thumbnail {float: left; width: 150px; height: auto;}
img.thumbnail {float: left; width: 150px; height: 150px;}
.contact-detail {text-align: center; margin-top: -50px;}
#content .contact-detail h2{text-align: center; font-size: 1rem; font-weight: 500; margin-bottom: 25px; margin-top: 25px;}
resources/views/visitor/cwbs/defaultLayout.blade.php
+15 -4
View File
@@ -14,7 +14,18 @@
<link href="@asset('style.css')" type="text/css" rel="stylesheet">
</head>
<body>
@if (!empty($googleAnalyticsCode))
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{$googleAnalyticsCode}}', 'auto');
ga('send', 'pageview');
</script>
@endif
<div class="top-bar">
<div class="top-bar-left">
<ul class="menu">
@@ -45,7 +56,7 @@
<div class="row text-center">
<ul class="menu social-icons">
<li>
<a href="#" target="_blank">
<a href="https://www.facebook.com/Custom-Wristbands-1657363637860379/?fref=ts." target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x w-t"></i>
@@ -61,21 +72,21 @@
</a>
</li>
<li>
<a href="#" target="_blank">
<a href="https://www.instagram.com/cwbs.cz/" target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x w-t"></i>
</span>
</a>
</li>
<li>
{{-- <li>
<a href="#" target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-pinterest-p fa-stack-1x w-t"></i>
</span>
</a>
</li>
</li>--}}
</ul>
<div class="clearfix"></div>
@widgetArea('mainMenu')
resources/views/visitor/cwbs/homepageLayout.blade.php
+15 -4
View File
@@ -14,7 +14,18 @@
<link href="@asset('style.css')" type="text/css" rel="stylesheet">
</head>
<body>
@if (!empty($googleAnalyticsCode))
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{$googleAnalyticsCode}}', 'auto');
ga('send', 'pageview');
</script>
@endif
<div class="top-bar homepage">
<div class="top-bar-left">
<ul class="menu">
@@ -112,7 +123,7 @@
<div class="row text-center">
<ul class="menu social-icons">
<li>
<a href="#" target="_blank">
<a href="https://www.facebook.com/Custom-Wristbands-1657363637860379/?fref=ts" target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x w-t"></i>
@@ -128,21 +139,21 @@
</a>
</li>
<li>
<a href="#" target="_blank">
<a href="https://www.instagram.com/cwbs.cz/" target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x w-t"></i>
</span>
</a>
</li>
<li>
{{-- <li>
<a href="#" target="_blank">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-pinterest-p fa-stack-1x w-t"></i>
</span>
</a>
</li>
</li>--}}
</ul>
<div class="clearfix"></div>
@widgetArea('mainMenu')
resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php
+2 -2
View File
@@ -67,7 +67,7 @@
</div>
<script type="text/javascript">
$('#formSend').click(function() {
this.value = 'Odesílám...';
$(this).value = 'Odesílám...';
$.ajax({
url: "{{route('email.send', ['formId' => $page->id])}}",
method: 'post',
@@ -79,7 +79,7 @@
} else {
alert(resp.message);
}
this.value="ODESLAT";
$(this).value="ODESLAT";
});
});
</script>
resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php
+10 -6
View File
@@ -6,13 +6,17 @@
<h2 id="assortment">{{$page->title}}</h2>
</div>
<div class="row text-center assorment-holder">
@if (!empty($page->subpages()))
@foreach($page->subpages() as $i => $subpage)
<div class="product-category column medium-4 small-12">
<a href="{{$subpage->url}}" class="button success large long rounded small-extra-large">{{$subpage->title}}</a>
@forelse($page->subpages() as $i => $subpage)
<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)">
<h5 class="assortment-h5">{{$subpage->title}}</h5>
{{--<p class="assortment-p">{{$subSubpage->meta_description}}</p>--}}
<a href="{{route('page.content', ['url' => $subpage->url])}}"
class="assortment-more-btn text-center">- více zde -</a>
</div>
@endforeach
@endif
@empty
@if (!empty($page->title_photo))<img class="thumbnail assortment" src="@upload($page->title_photo)">@endif
@endforelse
<div class="clearfix"></div>
<div class="m-b-25 m-t-50 p-lr-50-sm">
{!! $page->content !!}
resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php
+2 -2
View File
@@ -10,13 +10,13 @@
<p>
{!! $subpage->content !!}
</p>
<div class="row m-b-25 medium-11 medium-centered m-t-25 p-lr-50-sm" data-equalizer data-equalize-on="medium">
<div class="m-b-25 medium-11 medium-centered m-t-25 p-lr-50-sm" data-equalizer data-equalize-on="medium">
@if (!empty($subpage->subpages()))
@foreach($subpage->subpages() as $y => $subSubpage)
<div class="column subpages text-center small-12 medium-6 large-3 left" data-equalizer-watch>
<img class="thumbnail" src="@upload($subSubpage->title_photo)">
<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])}}"
class="assortment-more-btn text-center">- více zde -</a>
</div>