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

This commit is contained in:
Michal Kváček
2016-04-04 20:29:58 +02:00
8 changed files with 136 additions and 18 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ class Menu implements WidgetRenderer
$code .= '<li'; $code .= '<li';
if ($active) { if ($active) {
$code .= ' class="is-active"'; $code .= ' class="is-active active"';
} }
$code .= '><a href="' . route('page.content', ['url' => $page->url]) . '">' . e($page->title) . '</a></li>'; $code .= '><a href="' . route('page.content', ['url' => $page->url]) . '">' . e($page->title) . '</a></li>';
} }
@@ -69,7 +69,7 @@ class StaticPagesServiceProvider extends ServiceProvider
*/ */
public function registerViews() public function registerViews()
{ {
$viewPath = base_path('resources'.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'gallery'); $viewPath = base_path('resources'.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'staticpages');
$sourcePath = __DIR__ . DIRECTORY_SEPARATOR .'..'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'views'; $sourcePath = __DIR__ . DIRECTORY_SEPARATOR .'..'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'views';
$this->publishes([$sourcePath => $viewPath]); $this->publishes([$sourcePath => $viewPath]);

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

+101 -6
View File
@@ -19,12 +19,15 @@ a:hover {text-decoration: underline;}
.button.success {background-color: #46c1be;} .button.success {background-color: #46c1be;}
.button.success:hover, .button.success:focus, .button.success:active, .button.success.active {background-color: #4D4D4F;} .button.success:hover, .button.success:focus, .button.success:active, .button.success.active {background-color: #4D4D4F;}
.button.large, .button.expanded {font-size:0.9rem; padding: 0.9em 2.4em; font-weight: 700; margin-bottom: 0;} .button.large, .button.expanded {font-size:0.9rem; padding: 0.9em 2.4em; font-weight: 700; margin-bottom: 0;}
.button.large.long {padding: 0.9em 4em;} .button.large.long {padding: 0.9em 4em; text-transform: uppercase;}
.button.expanded.long {height: 3rem; padding: 1em 4em;} .button.expanded.long {height: 3rem; padding: 1em 4em;}
.w-t {color: #ffffff} .w-t {color: #ffffff}
.green-text {color: #46c1be !important;} .green-text {color: #46c1be !important;}
.dark {color: #414042 !important;}
.uppercase {text-transform: uppercase;} .uppercase {text-transform: uppercase;}
.bold {font-weight: 700;} .bold {font-weight: 700;}
.pointer {cursor: pointer;}
.has-tip {z-index: 1000}
[type="text"], [type="password"], [type="date"], [type="datetime"], [type="datetime-local"], [type="month"], [type="week"], [type="email"], [type="text"], [type="password"], [type="date"], [type="datetime"], [type="datetime-local"], [type="month"], [type="week"], [type="email"],
[type="number"], [type="search"], [type="tel"], [type="time"], [type="url"], [type="color"], textarea, [type="number"], [type="search"], [type="tel"], [type="time"], [type="url"], [type="color"], textarea,
@@ -39,13 +42,16 @@ textarea, textarea:focus {height: 120px;}
color: #414042; color: #414042;
} }
.subpages.column:last-child:not(:first-child), .subpages.columns:last-child:not(:first-child) { float: left;}
.top-bar {position: relative; top: 0; width: 100%;} .top-bar {position: relative; top: 0; width: 100%;}
.top-bar.homepage {position: absolute; top: 0; width: 100%;} .top-bar.homepage {position: absolute; top: 0; width: 100%;}
.top-bar, .top-bar ul {background-color: transparent; z-index: 500;} .top-bar, .top-bar ul {background-color: transparent; z-index: 500;}
.menu > li:not(.menu-text) > a {font-weight: 700; text-transform:uppercase; color: #4D4D4F} .menu > li:not(.menu-text) > a {font-weight: 700; text-transform:uppercase; color: #4D4D4F}
.menu > li:not(.menu-text) > a.active {color: #46c1be} .menu > li:not(.menu-text) > a.active,.menu > li:not(.menu-text).active > a {color: #46c1be}
.top-bar-right {position: absolute; bottom: 5px; right: 0;} .top-bar-right {margin-top: 75px;}
#show-menu {font-size: 1.4rem; line-height: 1.4; margin-top: -10px;}
.orbit.header {position: relative; z-index: 1;} .orbit.header {position: relative; z-index: 1;}
.orbit.header .orbit-next, .orbit.header .orbit-previous { background-color: #ffffff; color: #4d4d4f; padding: 40px;} .orbit.header .orbit-next, .orbit.header .orbit-previous { background-color: #ffffff; color: #4d4d4f; padding: 40px;}
@@ -79,10 +85,10 @@ hr {border-bottom: 0;width: 5%; margin: 0 auto; position: relative; top: -15px;
.grey-wrapper {background-color: #f1f1f1; padding: 50px 0; display: block;} .grey-wrapper {background-color: #f1f1f1; padding: 50px 0; display: block;}
.green-wrapper {background-color: #46c1be; padding: 50px 0; display: block;} .green-wrapper {background-color: #46c1be; padding: 50px 0; display: block;}
.white-wrapper {background-color: #ffffff; padding: 50px 0; display: block;} .white-wrapper {background-color: #ffffff; padding: 50px 0; display: block;}
.backgrounded {background-image: url(images/background_o_nás._white.jpg); background-size: cover; background-position: center center; } .backgrounded {background-image: url(images/background_o_nas._white.jpg); background-size: cover; background-position: center center; }
.assortment-h5 {text-align: center; text-transform: uppercase; font-weight: 500; font-size: 1.1rem;} .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;} .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;} .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%; box-shadow: none; border-width: 2px; border-color: #ffffff;}
img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #ffffff;} img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #ffffff;}
@@ -108,6 +114,9 @@ img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #fffff
.design-ul-block li {list-style-image: url(images/bullet.png); margin: 15px 30px 25px 30px;} .design-ul-block li {list-style-image: url(images/bullet.png); margin: 15px 30px 25px 30px;}
.design-ul-block li h6 {position: relative; top: -7px;} .design-ul-block li h6 {position: relative; top: -7px;}
.bullet-h6 h6 {text-transform: none; font-size: 1.2rem;}
.bullet-h6 h6:before {content: ''; background-image: url(images/bullet.png); height: 28px; width: 28px; display: inline-block; margin-right: 10px; position: relative; top: 7px;}
#content .bullet-h6 p { margin: 7px 30px 30px 40px; font-size: .75rem;}
.orbit.footer .orbit-next, .orbit.footer .orbit-previous { background-color: #46c1be; padding: 40px;} .orbit.footer .orbit-next, .orbit.footer .orbit-previous { background-color: #46c1be; padding: 40px;}
.orbit.footer .orbit-next:hover, .orbit.footer .orbit-previous:hover { background-color: #f58020;} .orbit.footer .orbit-next:hover, .orbit.footer .orbit-previous:hover { background-color: #f58020;}
@@ -121,7 +130,7 @@ img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #fffff
.image-bullet {margin-right: 7px; position: relative; top: -3px;} .image-bullet {margin-right: 7px; position: relative; top: -3px;}
.contact-p {margin-bottom: 0; padding-right: 50px; line-height: 1rem; font-weight: 300;} .contact-p {margin-bottom: 0; padding-right: 50px; line-height: 1rem; font-weight: 300;}
#content p.contact-p.green-text {color: #46c1be !important;} #content p.contact-p.green-text>b {color: #46c1be !important;}
footer {padding-top: 50px;} footer {padding-top: 50px;}
footer .menu {display: inline-block;} footer .menu {display: inline-block;}
@@ -131,3 +140,89 @@ footer a:hover {color: #46c1be;}
.social-icons a:hover .fa-stack-2x {color: #414042;} .social-icons a:hover .fa-stack-2x {color: #414042;}
.social-icons .fa.w-t {color: #ffffff;} .social-icons .fa.w-t {color: #ffffff;}
@media (max-width:1023px) {
#responsive-menu {display: none;}
.top-bar-right .menu.hide-for-large {font-size: 1.5rem; position: absolute; right: 0; top: 25px;}
#logo {width: 175px; height: auto;}
.orbit.header .orbit-next, .orbit.header .orbit-previous {font-size: 0.7rem; transform: translateY(-20%);}
.orbit.header .orbit-slide {height: 600px}
.orbit.header .orbit-slide:before { top: 30%; height: 50%;}
.orbit.header .orbit-slide .img {height: 600px;}
.orbit.header .orbit-slide h2 {top: 35%; font-size: 3.8rem;}
.orbit.header .orbit-slide h3 {top: calc(38% + 3rem); font-size: 2.7rem;}
#chevron-down {top: 73%;}
.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;}
.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;}
#content .contact-p {text-align: center; padding-right: 0; font-size: 0.8rem; line-height: 1.1;}
#responsive-menu {z-index: 500; width: 50%; height: 100%; min-height: 100%; position: absolute; top: -0; left: 50%; background-color: rgba(70, 193, 190, 0.8); }
#hidden-menu-divider {display: block; margin: 50px auto 20px; font-size: 1.8rem; color: #ffffff; text-align: center; font-weight: 500;}
.menu {height: auto;}
.top-bar-right .menu li {display: block; text-align: center; font-size: 1.8rem;}
#responsive-menu .menu li:first-child {margin-top: 100px;}
.top-bar-right .menu li a { font-weight: 500;}
#responsive-menu .menu li a.active,
#responsive-menu .menu li a:hover,
#responsive-menu .menu li a:hover *,
#responsive-menu .menu li.active a {
color: #ffffff; text-decoration: none;
}
#unload-menu {position: absolute; top: 0; float: right; margin: 10px;}
#unload-menu:hover * {color: #ffffff;}
}
@media (max-width:639px) {
#logo {width: 150px; height: auto;}
.orbit.header .orbit-next, .orbit.header .orbit-previous {font-size: 0.7rem; transform: translateY(-20%);}
.orbit.header .orbit-slide {height: 500px}
.orbit.header .orbit-slide:before { top: 35%; height: 45%;}
.orbit.header .orbit-slide .img {height: 500px;}
.orbit.header .orbit-slide h2 {top: 42%; padding: 20px 100px; line-height: 0.9;}
.orbit.header .orbit-slide h3 {display: none;}
.orbit.header .orbit-bullets {display: none;}
#chevron-down {display: none;}
.assortment-h5 {text-align: left; margin-left: 185px; font-size: 1.3rem;}
.assortment-p {text-align: left; margin-left: 185px; font-size: 0.75rem; width: 100%;}
.assortment-more-btn {text-align: left; margin-left: 185px; display: block;}
img.thumbnail {float: left; width: 150px; height: auto;}
#content h4 {font-size: 1rem; line-height: 1; width: 50%; float: left; padding-left: 30px; padding-right: 30px; text-align: left;}
#questions .button { margin-top: 7px !important;}
#design h6, #design p {text-align: center;}
.design-ul-block {width: 95%; margin: auto;}
#design .design-ul-block li h6, #design .design-ul-block li p {text-align: left;}
#design .bullet-h6 h6,#content .bullet-h6 p {text-align: left;}
.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;}
#content .contact-p {text-align: center; padding-right: 0; font-size: 0.8rem; line-height: 1.1;}
.orbit.footer .orbit-slide {height: auto;}
.orbit.footer .orbit-slide .small-6{margin-bottom: 10px; float: left;}
.orbit.footer .orbit-slide .small-6:nth-child(even):after{}
.orbit.footer .orbit-slide .img {height: 530px;}
.assorment-holder .small-12 {text-align: center !important; margin-bottom: 15px;}
.small-extra-large {font-size: 1.2rem !important; width: 80%;}
footer {padding-top: 20px;}
.p-lr-50-sm {padding-left: 50px; padding-right: 50px;}
#responsive-menu {z-index: 500; width: 100%; height: 100%; min-height: 100%; position: absolute; top: 0; left: 0; background-color: rgba(70, 193, 190, 0.8); }
#hidden-menu-divider {display: block; margin: 40px auto 20px; font-size: 1.8rem; color: #ffffff; text-align: center; font-weight: 500;}
.menu {height: auto;}
.top-bar-right .menu li {display: block; text-align: center; font-size: 1.8rem;}
.top-bar-right .menu li a { font-weight: 500;}
.top-bar-right .menu li a.active {color: #ffffff;}
#unload-menu {position: absolute; top: 0; float: right; margin: 10px;}
}
@@ -16,20 +16,26 @@
<body> <body>
<div class="top-bar homepage"> <div class="top-bar homepage">
<div class="top-bar-left"> <div class="top-bar-left">
<ul class="menu"> <ul class="menu">
<li class="menu-text"> <li class="menu-text">
<a href="{{route('page.index')}}"> <a href="{{route('page.index')}}">
<img src="@asset('images/cwbs_logo_medium.png')" alt="Custom Wristbands Logo"> <img id="logo" src="@asset('images/cwbs_logo_medium.png')" alt="Custom Wristbands Logo">
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="top-bar-right"> <div class="top-bar-right">
{{--CHYBI RESPONZIVNI MENU--}} <ul class="menu pull-right hide-for-large">
<li>
<a href="#" onclick="showResponsiveMenu()" id="show-menu">MENU<i class="fa fa-fw fa-2x fa-navicon"></i></a>
</li>
</ul>
<div id="responsive-menu">
<a href="#" id="unload-menu" class="hide-for-large" onclick="hideResponsiveMenu();"><i class="fa fa-fw fa-2x fa-mail-reply"></i></a>
@widgetArea('mainMenu') @widgetArea('mainMenu')
</div> </div>
</div>
</div> </div>
@widgetArea('homepageSlider') @widgetArea('homepageSlider')
@@ -43,8 +49,8 @@
</div> </div>
</div> </div>
<div class="white-wrapper clearfix"> <div class="white-wrapper clearfix">
<div class="row column" id="design"> <div class="row column medium-11 small-10 small-centered medium-centered " id="design">
<div class="columns medium-7"> <div class="columns medium-7 ">
@widgetArea('infoSirsi') @widgetArea('infoSirsi')
{{--<h6>Design a potisk</h6>--}} {{--<h6>Design a potisk</h6>--}}
{{--<p>--}} {{--<p>--}}
@@ -152,6 +158,23 @@
$ (function () { $ (function () {
$ (document).foundation (); $ (document).foundation ();
}); });
function showResponsiveMenu() {
var menuHolder = document.getElementById('responsive-menu');
menuHolder.style.display="block";
menuHolder.style.height = document.documentElement.clientHeight + 'px';
menuHolder.style.height = window.innerHeight + 'px';
menuHolder.style.height = '100%;';
}
function hideResponsiveMenu() {
var menuHolder = document.getElementById('responsive-menu');
menuHolder.style.display="none";
}
</script> </script>
</body> </body>
</html> </html>
@@ -1,7 +1,7 @@
@extendVisitor('homepageLayout') @extendVisitor('homepageLayout')
@section('content') @section('content')
<div class="row column text-center m-t-25 p-lr-50-sm"> <div class="row column text-center medium-11 medium-centered m-t-25 p-lr-50-sm">
<h2 id="assortment">{{$page->title}}</h2> <h2 id="assortment">{{$page->title}}</h2>
<hr> <hr>
<p> <p>
@@ -10,9 +10,9 @@
</div> </div>
@if (!empty($page->subpages())) @if (!empty($page->subpages()))
<div class="row m-b-25 m-t-25 p-lr-50-sm" data-equalizer data-equalize-on="medium"> <div class="row m-b-25 medium-11 medium-centered m-t-25 p-lr-50-sm" data-equalizer data-equalize-on="medium">
@foreach($page->subpages() as $i => $subpage) @foreach($page->subpages() as $i => $subpage)
<div class="column text-center small-12 medium-6 large-3" data-equalizer-watch> <div class="column subpages text-center small-12 medium-6 large-3 left" data-equalizer-watch>
<img class="thumbnail" src="{{config('app.upload_url')}}/{{$subpage->title_photo}}"> <img class="thumbnail" src="{{config('app.upload_url')}}/{{$subpage->title_photo}}">
<h5 class="assortment-h5">{{$subpage->title}}</h5> <h5 class="assortment-h5">{{$subpage->title}}</h5>
<p class="assortment-p">{{$subpage->meta_description}}</p> <p class="assortment-p">{{$subpage->meta_description}}</p>
@@ -26,7 +26,7 @@
@if (!isset($images[$i*$settings->imagePerSlide + $j])) @if (!isset($images[$i*$settings->imagePerSlide + $j]))
@break @break
@endif @endif
<div class="column medium-{{$gridNumber}}"> <div class="column medium-{{$gridNumber}} small-6">
<img src="{{config('app.upload_url')}}/{{$images[$i*$settings->imagePerSlide + $j]->filename}}" /> <img src="{{config('app.upload_url')}}/{{$images[$i*$settings->imagePerSlide + $j]->filename}}" />
</div> </div>
@endfor @endfor