projects / WP-Themes / RecycleEmmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f54dba0)
Earlier conflict, better resolution
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Jan 2015 18:56:34 +0000 (13:56 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Jan 2015 18:56:34 +0000 (13:56 -0500)
header.php patch | blob | history
page.php patch | blob | history

diff --git a/header.php b/header.php
index f8841b1..9f7fcff 100755 (executable)
--- a/header.php
+++ b/header.php
@@ -11,62 +11,9 @@
         <link href='http://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
     </head>
     <body>
-    <div class="off-canvas-wrap" data-offcanvas>
-    <div class="inner-wrap">
-        <div class="row content">
-            <div class="small-12 columns"> <!-- 111 -->
-                <header>
-                <div class="row">
-                <div class="small-12 medium-6 columns">    
-                    <a href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/logo.jpeg"></a>
-                </div>
-                <div class="small-12 medium-6 columns">
-                    <div id="top" class="row">
-                    <div class="medium-12 large-7 large-push-1 columns hide-for-small-down">
-                        <p id="phone">231-348-0640</p>
-                    </div>
-                    <div id="social" class="large-4 hide-for-medium-down columns">
-                        <div id="icons">
-                            <a id="contact" href="#"><img src="<?php echo get_template_directory_uri(); ?>/assets/mail.jpg"></a>
-                            <a id="face" href="#"><img src="<?php echo get_template_directory_uri(); ?>/assets/facebook.jpg"></a>
-                            <a id="tweet" href="#"><img src="<?php echo get_template_directory_uri(); ?>/assets/twit.jpg"></a>
-                            <a id="tube" href="#"><img src="<?php echo get_template_directory_uri(); ?>/assets/tube.jpg"></a>
-                        </div>
-                    </div>
-                    </div>
-                    <div class="row">
-                    <div class="small-12 large-9 columns">
-                        <div class="row">
-                        <div id="large-12_s" class="small-12 small-push-0 medium-push-0 large-12 large-push-4 columns">
-                            <input type="text" id="lar-search" placeholder="  Search the site">
-                        </div>
-                        <div id="top_angle" class="large-1 large-push-4 show-for-large-up columns"></div>
-                        </div>
-                    </div>
-                    <div class="row">
-                    <div class="small-12 medium-6 medium-push-5 columns">
-                        <!--<div class="qbutton"></div>--><a id="qbutton" href="#">Is it recyclable?                <div></div></a>
-                    </div>
-                    </div>
-                    </div>
-                </div>
-                </div>
-                <div class="row show-for-large-up">
-                    <div class="large-12 text-center columns side_space">
-                        <nav class="top-bar" data-topbar role="navigation">
-                        <section class="top-bar-section">
-                            <?php glm_page_menu(); ?>
-                        </section>
-                        </nav>
-                    </div>
-                </div>
-                    <!Off-canvas-Menu!>
-                <nav class="tab-bar hide-for-large-up">
-                    <section class="left-small">
-                        <a class="left-off-canvas-toggle menu-icon" href="#"><span>Menu</span></a>
-                    </section>
-                </nav>
-                <aside class="left-off-canvas-menu hide-for-large-up">
+        <div class="off-canvas-wrap" data-offcanvas>
+            <div class="inner-wrap">
+                <aside class="left-off-canvas-menu">
                     <?php glm_page_menu(); ?>
                 </aside>
                 <div class="row content">
diff --git a/page.php b/page.php
index 5010242..b659096 100755 (executable)
--- a/page.php
+++ b/page.php
@@ -43,29 +43,9 @@
                 <div id="locate" class="medium-9 medium-offset-4">
                     <p>Emmet County Department of Public Works<br>200 Division Street, Petoskey, MI 49770 &#8226; 231-348-1702</p>
                 </div>
-                <div id="main" class="row">
-                <div class="small-8 medium-9 columns">
-                    <div class="row">
-                    <div class="small-11 small-push-1 left columns">
-                        <ul id="breadcrumbs">
-                        
-                        </ul>
-                    </div>
-                    </div>
-                        <?php if(have_posts()) : while(have_posts()): the_post();?>
-                        <?php the_content();?>
-                        <?php endwhile; else:?>
-                        <p><?php _e('Sorry, no results were found.');?></p>
-                        <?php endif;?>
-                    <div id="last" class="row show-for-medium-up">
-                        <div class="medium-2 medium-push-2">
-                            <img class="left" src="<?php echo get_template_directory_uri(); ?>/assets/sm-logo.png">
-                        </div>
-                        <div id="locate" class="medium-8 medium-push-3">
-                            <p>Emmet County Department of Public Works<br>200 Division Street, Petoskey, MI 49770 &#8226; 231-348-1702</p>
-                        </div>
-                    </div>
-                </div>
-                <?php get_sidebar(); ?>
-                </div>
+            </div>
+        </div>
+    </div>
+    <?php get_sidebar(); ?>
+</div>
 <?php get_footer(); ?>
\ No newline at end of file