From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 16 Feb 2016 21:35:19 +0000 (-0500)
Subject: working on sidebar
X-Git-Tag: v1.0.0^2~98
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3a66a1f60f2b706eb5ca1cab5a287e474f9ac3aa;p=WP-Themes%2Fjollylama.git

working on sidebar
---

diff --git a/front-page.php b/front-page.php
index 392018e..f4cd4f8 100644
--- a/front-page.php
+++ b/front-page.php
@@ -1,16 +1,16 @@
 <?php get_header(); ?>
 <main class="page-front">
     <div class="row">
-        <?php get_template_part('parts/slide-show');?>
+        
     </div>
     <div id="content-wrapper">
-        <div class="row" data-equalizer data-options="equalize_on_stack: false">
-            <?php
-            get_template_part('parts/glm-blocks');
-            ?>
-        </div>
+        
         <div class="row">
-            <div id="main-content" class="small-12 columns">
+            <div class="large-3 columns show-for-large-up">
+                <?php get_sidebar(); ?>
+            </div>
+            <div id="main-content" class="small-12 large-9 columns">
+                <?php get_template_part('parts/slide-show');?>
                 <?php if(have_posts()) : while(have_posts()): the_post();?>
                 <?php the_content();?>
                 <?php endwhile; else:?>
diff --git a/sidebar.php b/sidebar.php
index abb96e5..0ccc299 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,6 +1,2 @@
-<!--
-                        <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>-->
+<?php glm_side_menu(); ?>
+<img src="<?php echo bloginfo('template_url');?>/assets/jolly.png">