From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 10 Nov 2015 20:08:11 +0000 (-0500)
Subject: updating page elements
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4ef21056c7197e1f64a1fb7503d4c4cfbed4433d;p=web%2FGruntInit%2FglmTheme.git

updating page elements
---

diff --git a/root/footer.php b/root/footer.php
index a4ca64a..2648e9a 100644
--- a/root/footer.php
+++ b/root/footer.php
@@ -1,3 +1,4 @@
+                    </main><!--End of main-->
                         <footer>
                             <?php if (is_active_sidebar('sidebar-f')) :?>
                                 <?php dynamic_sidebar('sidebar-f');?>
@@ -6,8 +7,8 @@
                                 <?php get_template_part('parts/client-info-footer');?>
                             </div>
                         </footer>
-                    </main><!--End of main-->
-                </div><!--/.shadow-wrapper-->
+                    
+                
                 <div id="copyright" class="small-12 text-center row columns">
                     <span>&copy; <?php echo date('Y');?> {%= title %}</span>
                     <span class="bullet"> &#8226; </span>
diff --git a/root/front-page.php b/root/front-page.php
index 853b913..70661bb 100644
--- a/root/front-page.php
+++ b/root/front-page.php
@@ -4,7 +4,7 @@
         <?php get_template_part('parts/slide-show');?>
     </div>
     <div id="content-wrapper">
-        <div class="row">
+        <div class="row" data-equalizer data-options="equalize_on_stack: false">
             <?php
             get_template_part('parts/glm-blocks');
             ?>
diff --git a/root/header.php b/root/header.php
index c0bb978..6271723 100644
--- a/root/header.php
+++ b/root/header.php
@@ -13,21 +13,15 @@
       <div class="off-canvas-wrap" data-offcanvas>
         <div class="inner-wrap">
             <div id="page-wrapper">
-                <div class="shadow-wrapper">
                     <header>
                         <div class="row">
-                            <div class="medium-4 columns show-for-medium-only">
-                                <a href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/logo.png"></a>
-                            </div>
-                            <div class="small-12 columns show-for-small-down text-center">
-                                <a href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/logo.png"></a>
-                            </div>
+                            
                         </div>
+<!--
                         <div class="search-top show-for-large-up">
                             <?php get_template_part('parts/search');?>
                         </div>
-                        <div class="row">
-                            <?php get_template_part('parts/top-bar');?>
-                        </div>
-                        <?php get_template_part('parts/off-canvas-menu');?>
+-->
                     </header>
+                    <?php get_template_part('parts/top-bar');?>
+                    <?php get_template_part('parts/off-canvas-menu');?>
diff --git a/root/page.php b/root/page.php
index d01cf52..226bca9 100644
--- a/root/page.php
+++ b/root/page.php
@@ -3,13 +3,13 @@
         <?php if (is_page("kitchensink")) {
             get_template_part('parts/glm-kitchen-sink');
         } else { ?>
+    <!-- kitchensink check - delete me before going live -->
         <div id="content-wrapper">
             <div class="row">
                 <?php
                 get_template_part('parts/bread-crumbs');
                 ?>
             </div>
-            <!-- kitchensink check - delete me before going live -->
             <div class="row">
                 <div id="main-content" class="small-12 medium-6 large-8 columns">
                         <?php if(have_posts()) : while(have_posts()): the_post();?>
diff --git a/root/parts/glm-blocks.php b/root/parts/glm-blocks.php
index 636ea4d..e011144 100644
--- a/root/parts/glm-blocks.php
+++ b/root/parts/glm-blocks.php
@@ -2,7 +2,7 @@
 <?php $blocks = fetch_all_glm_blocks();?>
 <div class="blocks">
     <?php foreach ($blocks as $block):?>
-    <div class="text-center small-12 large-4 columns large-text-left blocks">
+    <div class="text-center small-12 medium-4 columns large-text-left blocks">
             <?php if($block->url):?>
             <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
             <?php endif;?>
@@ -22,5 +22,5 @@
     </div>
     <?php endforeach;?>
 </div>
-<div class="separator"><hr></div>
+<!--<div class="separator"><hr></div>-->
 <?php endif;?>
diff --git a/root/parts/off-canvas-menu.php b/root/parts/off-canvas-menu.php
index 6ef952a..d471ae0 100644
--- a/root/parts/off-canvas-menu.php
+++ b/root/parts/off-canvas-menu.php
@@ -2,3 +2,36 @@
     <?php glm_theme_mobile_off_canvas(); ?>
     <?php get_template_part('parts/client-info-offcanvas');?>
 </aside>
+<!--
+<aside class="right-off-canvas-menu">
+    <div class="row">
+        <div id="title" class="small-11 small-centered columns text-center">
+            <span>Reservations</span>
+        </div>
+    </div>
+    <form method="post">
+        <div class="row">
+            <div class="small-12 res-search columns">
+                <input type="text" placeholder="Property" name="s">
+            </div>
+            <div class="small-12 res-date columns">
+                <input type="text" placeholder="Arrive" name="datepicker1" required="required">
+            </div>
+            <div class="small-12 res-date columns">
+                <input type="text" placeholder="Depart" name="datepicker2" required="required">
+            </div>
+            <div class="small-12 columns">
+                <input type="text" placeholder="Number of Nights">
+            </div>
+            <div class="small-6 guest columns">
+                <input type="text" placeholder="Adults" >                
+            </div>
+            <div class="small-6 guest columns">
+                <input type="text" placeholder="Kids" >                
+            </div>
+            <div class="small-6 small-centered columns">
+                <input class="res-button" type="button" value="Book Now">
+            </div>
+        </div>
+    </form>
+</aside>-->
diff --git a/root/parts/search.php b/root/parts/search.php
index 0f27490..551b5fa 100644
--- a/root/parts/search.php
+++ b/root/parts/search.php
@@ -1,6 +1,8 @@
 <form role="search" method="get" id="searchform" action="<?php echo home_url('/'); ?>">
      <input class="search-input" type="text" placeholder="Search" value="" name="s" id="lar-search">
+<!--
      <input class="search-button" type="image" 
         src="<?php bloginfo('template_url'); ?>/assets/search_button.png" 
         value="submit" name="searchButton">
+-->
 </form>
\ No newline at end of file
diff --git a/root/search.php b/root/search.php
index 12f2771..4a7bfa8 100644
--- a/root/search.php
+++ b/root/search.php
@@ -1,9 +1,12 @@
 <?php get_header(); ?>
 <main class="search-results">
-    <?php if (get_search_query() == "") { ?>
-    <br><h2 class="search-result-header small-12 columns">Please enter a query in the search box. </h2>
-    <?php } else { ?>
-    <br><h2 class="search-result-header small-12 columns">Search Results for "<?php echo get_search_query(); ?>"</h2>
+    <div class="row">
+        <?php if (get_search_query() == "") { ?>
+        <br><h2 class="search-result-header small-12 columns">Please enter a query in the search box. </h2>
+        <?php } else { ?>
+        <br><h2 class="search-result-header small-12 columns">Search Results for "<?php echo get_search_query(); ?>"</h2>
+    </div>
+    
     <div class="row">
         <div id="blog-posts-over" class="small-12 medium-9 columns">
             <?php if(have_posts()) : while(have_posts()): the_post();?>
diff --git a/root/sidebar.php b/root/sidebar.php
index 83d2421..abb96e5 100644
--- a/root/sidebar.php
+++ b/root/sidebar.php
@@ -1,5 +1,6 @@
+<!--
                         <div id="side-nav" class="large-3 columns show-for-large-up" data-equalizer-watch>
                             <div class="row collapse">
                                 <?php glm_side_menu(); ?>
                             </div>
-                        </div>
\ No newline at end of file
+                        </div>-->
diff --git a/root/style.css b/root/style.css
index 7eb060e..bec8c63 100644
--- a/root/style.css
+++ b/root/style.css
@@ -3,5 +3,5 @@ Theme Name: {%= name %}
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for {%= name %}
-Version: 1.234
+Version: 1.0
 */