From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 7 Apr 2016 14:56:54 +0000 (-0400)
Subject: stash conflict
X-Git-Tag: v1.0.0^2~105
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ad4b42d260a9e0890b4b86c284fe3f1b9364b46f;p=WP-Themes%2Fgaslightmedia.git

stash conflict
---

diff --git a/css/app.css b/css/app.css
index a8475d5..f7c0755 100644
--- a/css/app.css
+++ b/css/app.css
@@ -6526,24 +6526,6 @@ main {
     .statements h1 img {
       display: none; } }
 
-#statement-pre-slider {
-  display: inline-block;
-  margin-left: -70px;
-  margin-right: 18px; }
-
-#statement-slider {
-  width: 100px;
-  display: inline-block; }
-
-@media only screen and (max-width: 40em) {
-  #statement-pre-slider {
-    display: block;
-    margin: 0 auto; }
-  #statement-slider {
-    width: auto;
-    display: inline-block;
-    margin: 0 auto; } }
-
 main.page-inside .statements {
   margin-bottom: 15px; }
 main.page-inside #content-wrapper #main-content h1 {
diff --git a/front-page.php b/front-page.php
index 5572c1f..7acae96 100644
--- a/front-page.php
+++ b/front-page.php
@@ -5,11 +5,11 @@
     <?php get_template_part('parts/statements');?>
     <div class="row medium-uncollapse large-collapse">
         <div class="small-12 columns">
-            <ul class="small-block-grid-2 medium-block-grid-4">
-                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/we-design-and-development.jpg"></li>
-                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/search-engine--optimization.jpg"></li>
-                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/website-hosting.jpg"></li>
-                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/email-services.jpg"></li>
+            <ul id="services" class="small-block-grid-2 medium-block-grid-4">
+                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/we-design-and-development.jpg"><h3>Web Design & Development</h3></li>
+                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/search-engine--optimization.jpg"><h3>Search Engine Optimization</h3></li>
+                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/website-hosting.jpg"><h3>Web Hosting</h3></li>
+                <li><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/email-services.jpg"><h3>Email Service</h3></li>
             </ul>
         </div>
     </div>
diff --git a/scss/_main.scss b/scss/_main.scss
index 9c10c7f..e7b49d6 100644
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -13,26 +13,25 @@ main {
         }
     }
 }
-#statement-pre-slider {
-    display: inline-block;
-    margin-left: -70px;
-    margin-right: 18px;
-}
-#statement-slider {
-    width: 100px;
-    display: inline-block;
-}
-@media #{$small-only} {
-    #statement-pre-slider {
-        display: block;
-        margin: 0 auto;
-    }
-    #statement-slider {
-        width: auto;
-        display: inline-block;
-        margin: 0 auto;
-    }
-}
+//#statement-pre-slider {
+//    display: inline-block;
+//    margin-left: -70px;
+//    margin-right: 18px;
+//}
+//#statement-slider {
+//    width: 100px;
+//    display: inline-block;
+//}
+//@media #{$small-only} {
+//    #statement-pre-slider {
+//        display: block;
+//        margin: 0 auto;
+//    }
+//    #statement-slider {
+//        width: auto;
+//        display: inline-block;
+//        margin: 0 auto;
+//}
 main.page-inside {
     .statements {
         margin-bottom: 15px;