From bfcd20c22fcd9eb733edcb3e67807eb5d1758735 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 12 Aug 2016 16:35:46 -0400
Subject: [PATCH] fixed issue at 640 px where blocks were overlapping each
 other

---
 css/app.css            |  2 +-
 js/app.js              | 13 +++++++++----
 js/custom/pageSetup.js | 13 +++++++++----
 parts/glm-blocks.php   |  2 +-
 scss/_main.scss        |  2 +-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/css/app.css b/css/app.css
index c8d5e34..cf68994 100644
--- a/css/app.css
+++ b/css/app.css
@@ -6907,7 +6907,7 @@ main.page-inside #main-content {
   .blocks .glm-block .block-overlay {
     margin: 0 auto; } }
 
-@media (max-width: 640px) and (min-width: 390px) {
+@media (max-width: 639px) and (min-width: 390px) {
   .blocks .glm-block .block-overlay {
     width: 300px; } }
 
diff --git a/js/app.js b/js/app.js
index 141f43b..cde400b 100644
--- a/js/app.js
+++ b/js/app.js
@@ -138,7 +138,12 @@ $(document).ready(function () {
     
     // initialize the slick sliders on the events and blocks front page
     function check_window_width(){
-        if($(window).width() > 1025){
+        var block = $('.glm-block');
+        if( $(window).width() == 640 ){
+            $(block).css("margin", "0 -15px");
+        }
+        
+        if($(window).width() > 1023){
             if($(".glm-blocks-container").hasClass('slick-initialized') ) {
                 $(".glm-blocks-container").slick('unslick')
             } 
@@ -156,7 +161,7 @@ $(document).ready(function () {
                 slidesToScroll: 1
             });
             
-        } else if($(window).width() < 1025 &&$(window).width() > 639){
+        } else if($(window).width() < 1025 && $(window).width() > 639){
             if($(".glm-blocks-container").hasClass('slick-initialized')) {
                 $(".glm-blocks-container").slick('unslick');
             } 
@@ -167,14 +172,13 @@ $(document).ready(function () {
             });
              if($(".feed").hasClass('slick-initialized') ) {
                $(".feed").slick('unslick')
-
             } 
              $(".feed").slick({
                 infinite: true,
                 slidesToShow: 2,
                 slidesToScroll: 1
             });
-        } else if($(window).width() < 639 &&$(window).width() > 319){
+        } else if($(window).width() < 641 && $(window).width() > 319){
             if($(".glm-blocks-container").hasClass('slick-initialized')) {
                 $(".glm-blocks-container").slick('unslick');
             } 
@@ -231,4 +235,5 @@ $(document).ready(function () {
         sitemap.addClass("sitemap");
     }
     $('<h2> Pages </h2>').insertBefore(sitemap);
+    
 });
diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 15844a7..fe8769f 100644
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -129,7 +129,12 @@ $(document).ready(function () {
     
     // initialize the slick sliders on the events and blocks front page
     function check_window_width(){
-        if($(window).width() > 1025){
+        var block = $('.glm-block');
+        if( $(window).width() == 640 ){
+            $(block).css("margin", "0 -15px");
+        }
+        
+        if($(window).width() > 1023){
             if($(".glm-blocks-container").hasClass('slick-initialized') ) {
                 $(".glm-blocks-container").slick('unslick')
             } 
@@ -147,7 +152,7 @@ $(document).ready(function () {
                 slidesToScroll: 1
             });
             
-        } else if($(window).width() < 1025 &&$(window).width() > 639){
+        } else if($(window).width() < 1025 && $(window).width() > 639){
             if($(".glm-blocks-container").hasClass('slick-initialized')) {
                 $(".glm-blocks-container").slick('unslick');
             } 
@@ -158,14 +163,13 @@ $(document).ready(function () {
             });
              if($(".feed").hasClass('slick-initialized') ) {
                $(".feed").slick('unslick')
-
             } 
              $(".feed").slick({
                 infinite: true,
                 slidesToShow: 2,
                 slidesToScroll: 1
             });
-        } else if($(window).width() < 639 &&$(window).width() > 319){
+        } else if($(window).width() < 641 && $(window).width() > 319){
             if($(".glm-blocks-container").hasClass('slick-initialized')) {
                 $(".glm-blocks-container").slick('unslick');
             } 
@@ -222,4 +226,5 @@ $(document).ready(function () {
         sitemap.addClass("sitemap");
     }
     $('<h2> Pages </h2>').insertBefore(sitemap);
+    
 });
diff --git a/parts/glm-blocks.php b/parts/glm-blocks.php
index c5c7abf..5d3d7e8 100644
--- a/parts/glm-blocks.php
+++ b/parts/glm-blocks.php
@@ -21,7 +21,7 @@
                     </a>
                     <?php endif;?>
                     <p><?php echo $block->post_content . $block->post_excerpt;?></p>
-                    <a class="blocks-readmore" href="<?php echo $block->url;?>"><button><?php echo substr(strip_tags($block->post_content),0,12); ?></button></a>
+                    <a class="blocks-readmore" href="<?php echo $block->url;?>"><button><?php echo substr(strip_tags($block->post_content),0,13); ?></button></a>
                 </div>
     </div>
     <?php endforeach;?>
diff --git a/scss/_main.scss b/scss/_main.scss
index a41c5d5..0d9a109 100644
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -535,7 +535,7 @@ main.page-inside {
         margin: 0 auto;
     }
 }
-@media(max-width: 640px) and (min-width: 390px){
+@media(max-width: 639px) and (min-width: 390px){
     .blocks .glm-block .block-overlay{
         width: 300px;
     }
-- 
2.17.1