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

FIX: fix alert on contact form
FEATURE: added google+ link into social icons
2016-05-25 14:46:10 +02:00 · 2016-05-25 14:45:47 +02:00 · 2016-04-25 19:01:10 +02:00 · 2016-04-25 18:54:38 +02:00 · 2016-04-25 18:48:49 +02:00 · 2016-04-25 18:32:42 +02:00
9 changed files with 39 additions and 21 deletions
@@ -26,6 +26,7 @@ function hideResponsiveMenu() {
 }

 window.onresize = function() {
+    var menuHolder = document.getElementById('responsive-menu');
    if(window.innerWidth >= 1023) {
        menuHolder.style.display="block";
        menuHolder.style.height = "auto";
@@ -1,4 +1,5 @@
 body,h1,h2,h3,h4,h5,h6, * {font-family: 'Ubuntu', sans-serif; color: #414042;}
+/*body {overflow-x: hidden;}*/
 a, a:link, a:hover {color: #46c1be; font-weight: 500;}
 a:hover {text-decoration: underline;}

@@ -95,9 +96,9 @@ 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%; width: 100%; height: auto; 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;}
+img.thumbnail {border-radius: 50%; width: 100%; height: auto; box-shadow: none; border-width: 2px; border-color: #cdccd0;}
+img.thumbnail.assortment {width: 250px; margin: auto; float: none;}
+img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #cdccd0;}

 .sale-image-holder>img {width: 100%; height: auto; border: 1px solid #414042;}
 .sale-image-holder {margin-bottom: 15px; position: relative; cursor: pointer;}
@@ -107,7 +108,7 @@ img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #fffff
 .sale-item-data p {margin: -5px auto 0; padding: 0 auto; text-align: center; font-size: 0.8rem;}
 .sale-item-data p.price {margin-top: 10px; font-weight: 700; font-size: 0.9rem;}

-.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;}
 .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),
 .product-category.column:last-child:not(:first-child), .product-category.columns:last-child:not(:first-child),
@@ -207,10 +208,13 @@ footer a:hover {color: #46c1be !important;}
    .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;}
+    .subpages.column {margin-top: 5px;}
+    .assortment-h5 {text-align: left; margin-left: 115px; font-size: 1.3rem;}
+    .assortment-p {text-align: left; margin-left: 115px; font-size: 0.75rem; width: 100%;}
+    .assortment-more-btn {text-align: left; margin-left: 115px; display: block; width: calc(100% - 115px);}
+    img.thumbnail {float: left; width: 100px; height: auto;}
+
+    .gallery-image-holder, .gallery-image-holder>img {height: 150px;}

    #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;}
@@ -228,13 +232,17 @@ footer a:hover {color: #46c1be !important;}
    .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;}
+    .p-lr-15-sm {padding-left: 15px; padding-right: 15px;}
+
+    .footer-menu ul.menu li{display: block;    }
+    .footer-info a {display: block;}
+    .footer-info span {display: none;}

    #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;}
@@ -245,6 +253,11 @@ footer a:hover {color: #46c1be !important;}
    #unload-menu {position: absolute; top: 0; float: right; margin: 10px;}
 }

+@media (max-width:430px) {
+    #content h4 {width: 100%;}
+    #questions .button { margin-top: 7px !important;}
+}
+
 /* BLightBox defaults */
 .b-lightbox-holder{background-color:rgba(0,0,0,0.85);width:100%;height:100%;position:fixed;top:0;left:0;display:none;z-index:1000;}
 .b-lightbox-image{display:none;border-radius:0;max-height:90%;max-width:90%;position:fixed;margin:0 auto;z-index:1001;}
@@ -255,4 +268,4 @@ footer a:hover {color: #46c1be !important;}
 .b-lightbox-direction.previous{left:0}
 .b-lightbox-direction:hover{background-color:rgba(242,242,242,0.1); text-decoration: none;}
 .b-lightbox-direction:before{content:'';height:35%;display:block;width:100%;}
-.b-lightbox-label{box-sizing:border-box;display:none;z-index:1015;background-color:rgba(70, 193, 190, 0.2);color:rgba(246,246,246,0.95);font-weight:500;position:absolute;padding:10px;font-size:13px;}
+.b-lightbox-label{box-sizing:border-box;display:none;z-index:1015;background-color:rgba(70, 193, 190, 0.7);color:rgba(246,246,246,0.95);font-weight:500;position:absolute;padding:10px;font-size:13px;}
@@ -67,7 +67,7 @@
                </a>
            </li>
            <li>
-                <a href="#" target="_blank">
+                <a href="https://plus.google.com/u/0/101673591651165231109" target="_blank">
                    <span class="fa-stack fa-lg">
                        <i class="fa fa-circle fa-stack-2x"></i>
                        <i class="fa fa fa-google-plus fa-stack-1x w-t"></i>
@@ -92,7 +92,9 @@
            </li>--}}
        </ul>
        <div class="clearfix"></div>
-        @widgetArea('mainMenu')
+        <div class="footer-menu">
+            @widgetArea('mainMenu')
+        </div>
        <div class="clearfix"></div>
        <hr>
        @widgetArea('footer')
@@ -129,7 +129,7 @@
                </a>
            </li>
            <li>
-                <a href="#" target="_blank">
+                <a href="https://plus.google.com/u/0/101673591651165231109" target="_blank">
                    <span class="fa-stack fa-lg">
                        <i class="fa fa-circle fa-stack-2x"></i>
                        <i class="fa fa fa-google-plus fa-stack-1x w-t"></i>
@@ -154,7 +154,9 @@
            </li>--}}
        </ul>
        <div class="clearfix"></div>
-        @widgetArea('mainMenu')
+        <div class="footer-menu">
+            @widgetArea('mainMenu')
+        </div>
        <div class="clearfix"></div>
        <hr>
        @widgetArea('footer')
@@ -40,7 +40,7 @@
            <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCjADMGOysqt0ibo9mD5Cr8rs47ZQF8rKQ&callback=initMap" async defer></script>
        </div>
        <div class="large-6 column green-wrapper p-25" id="contact-form">
-            <div class="column large-12 medium-8 medium-centered p-lr-0 p-lr-50-sm">
+            <div class="column large-12 medium-8 small-12 medium-centered p-lr-0 p-lr-15-sm">
                <h6 class="text-center uppercase m-b-25 bold">Napište nám</h6>
                <form id="form-{{$page->id}}">
                    {!! csrf_field() !!}
@@ -72,8 +72,8 @@
                    method: 'post',
                    data: $('#form-{{$page->id}}').serialize()
                }).done(function(resp) {
-                    if(resp.status == true) {
-                        alert('Úspešne ste nám odoslali správu. Odpovieme Vám čo najskôr!');
+                    if(resp.status == 'success') {
+                        alert('Zpráva úspěšně odeslána. Odpovíme co nejdříve!');
                        window.top.location.reload();
                    } else {
                        alert(resp.message);
@@ -6,7 +6,7 @@
    <div class="row column gallert" id="gallery-images">
        <h2 class="m-b-25">{{$page->title}}</h2>
        @foreach($images as $index => $image)
-            <div class="column medium-3 small-6 gallery-image-holder b-invo" data-index="{{$index}}" data-img="" data-label="{{$image->description}}">
+            <div class="column large-3 medium-4 small-6 gallery-image-holder b-invo" data-index="{{$index}}" data-img="" data-label="{{$image->description}}">
                <img src="{{config('app.upload_url')}}/{{$image->filename}}" alt="{{$image->name}}">
                <div class="gallery-item-data text-center">
                    @if (isset($image->name) && !empty($image->name))
@@ -5,7 +5,7 @@
        <div class="row column text-center">
            <h2 id="assortment">{{$page->title}}</h2>
        </div>
-        <div class="row text-center assorment-holder">
+        <div class="row text-center assortment-holder p-lr-15-sm">
        @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>
                <div class="image-clicker b-invo" data-img="" data-label="{{$subpage->title}}" >
@@ -4,11 +4,11 @@

    @if (!empty($page->subpages()))
        @foreach($page->subpages() as $i => $subpage)
-        <div class="row column text-center medium-11 medium-centered m-t-25 p-lr-50-sm">
+        <div class="row column text-center small-12 medium-11 medium-centered m-t-25 p-lr-15-sm">
            <h2>{{$subpage->title}}</h2>
            <hr>
            {!! $subpage->content !!}
-            <div class="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-0" 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 m-b-25" data-equalizer-watch>
Author	SHA1	Message	Date
Michal Kváček	7b3f9f1717	Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz	2016-05-25 14:46:10 +02:00
Michal Kváček	6037f88260	FIX: fix alert on contact form	2016-05-25 14:45:47 +02:00
peter	3df68ad5cd	FEATURE: added google+ link into social icons	2016-04-25 19:01:10 +02:00
peter	b06f884b4a	FIX: fixed image placement in assortment detail for mobile	2016-04-25 18:54:38 +02:00
peter	53894d4657	FEAUTRE: fixed horizontal overflow on mobiles - another rule	2016-04-25 18:48:49 +02:00
peter	91683a48e2	FEAUTRE: fixed horizontal overflow on mobiles	2016-04-25 18:32:42 +02:00
peter	66f0873bc8	FEATURE: fixed mobile design flaws	2016-04-25 17:55:05 +02:00
peter	c17ddd48f8	Some small graphical changes	2016-04-20 21:12:50 +02:00