adding changes from the france journey clone to speed up things

I added the changes from a France Journeys clone to hopefully help speed
up production.

diff --git a/root/functions.php b/root/functions.php
index 5d34fb9..7290f82 100644 (file)
--- a/root/functions.php
+++ b/root/functions.php
@@ -11,6 +11,11 @@ if (!function_exists('glm_quicksite_widget_init')) {
 
     function glm_quicksite_widget_init()
     {
+        register_sidebar(array(
+            'name'        => __('Footer Widget Area'),
+            'id'          => 'sidebar-f',
+            'description' => __('Widget Area in the Footer')
+        ));
         register_sidebar(array(
             'name'        => __('Slideshow'),
             'id'          => 'slideshow',

diff --git a/root/scss/_main.scss b/root/scss/_main.scss
index 81a7da7..a0cb236 100644 (file)
--- a/root/scss/_main.scss
+++ b/root/scss/_main.scss
@@ -1,32 +1,32 @@
 .breadcrumbs {
     margin-top: 10px;
 }
-#content-bulk {
-    #con {
-        margin: 0;
-    }
-    h2 {
-        text-transform: uppercase;
-        font-size: 25px;
-    }
-    footer {
-        margin: 35px 0;
-        #address {
-            margin-top: 25px;
-            p {
-                font-size: 12px;
-                margin-top: 5px;
-            }
-            img {
-                margin: 0;
-                padding-right: 5px;
-            }
-            a {
-                font-size: 12px;
-            }
-        }
-        img {
-            box-shadow: none;
-        }
-    }
-}
+//#content-bulk {
+//    #con {
+//        margin: 0;
+//    }
+//    h2 {
+//        text-transform: uppercase;
+//        font-size: 25px;
+//    }
+//    footer {
+//        margin: 35px 0;
+//        #address {
+//            margin-top: 25px;
+//            p {
+//                font-size: 12px;
+//                margin-top: 5px;
+//            }
+//            img {
+//                margin: 0;
+//                padding-right: 5px;
+//            }
+//            a {
+//                font-size: 12px;
+//            }
+//        }
+//        img {
+//            box-shadow: none;
+//        }
+//    }
+//}

diff --git a/root/scss/_page.footer.scss b/root/scss/_page.footer.scss
index c8d63e8..d8f930f 100644 (file)
--- a/root/scss/_page.footer.scss
+++ b/root/scss/_page.footer.scss
@@ -1,3 +1,7 @@
+#space {
+    background-color: #0065a4;
+    height: 400px;
+}
 footer.main {
     position: absolute;
     bottom: 0;

diff --git a/root/scss/_page.header.scss b/root/scss/_page.header.scss
index 0162053..11a5bdb 100644 (file)
--- a/root/scss/_page.header.scss
+++ b/root/scss/_page.header.scss
@@ -1,96 +1,96 @@
 header {
     height: auto;
-    & #logo {
-        img {
-            margin-bottom: 15px;
-        }
-    }
-    & .search {
-        input {
-            height: 20px;
-            width: 167px;
-            padding: 0 8px;
-            margin: 13px 0px 0px 18px;
-            border-radius: 3px;
-            font-size: 10px;
-            color: $black;
-            display: inline-block;
-        }
-        a {
-            &.magnifying-glass {
-                font-size: 10em; /* This controls the size. */ 
-                display: inline-block; 
-                width: rem-calc(10); 
-                height: rem-calc(10);
-                border: rem-calc(2) solid $d-blue; 
-                position: relative; 
-                border-radius: 0.35em;
-                margin: 0 0 0 -25px;
-                &:before {
-                    content: ""; 
-                    display: inline-block; 
-                    position: absolute; 
-                    right: rem-calc(-7); 
-                    bottom: rem-calc(-4); 
-                    border-width: 0; 
-                    background: $d-blue; 
-                    width: rem-calc(8); 
-                    height: rem-calc(2); 
-                    -webkit-transform: rotate(45deg); 
-                    -moz-transform: rotate(45deg);
-                    -ms-transform: rotate(45deg);
-                    transform: rotate(45deg);
-                }
-            }
-        }
-    }
-    #sec-nav {
-        position: relative;
-        text-align: left;
-        padding: 10px 0;
-        margin: 0 0 15px 45px;
-        ul {
-            margin: 0;
-            li {
-                display: inline;
-                a {
-                    font-size: 12px;
-                    color: $d-blue;
-                    padding: 0 5px;
-                    font-weight: bold;
-                }
-            }
-        }
-        & > ul > li {
-            position: relative;
-            &:before {
-                color: $aluminum;
-                content: "|";
-                position: absolute;
-                top: 2px;
-                left: -15px;
-                font-size: 14px;
-                font-weight: bold;
-                display:block;
-                padding: 0 10px;
-            }
-            &:first-child:before {
-                content: none;
-            }
-        }
-    }
-    img {
-        margin-left: 5px;
-    }
-    .social {
-        margin-top: -25px;
-        padding-right: 0;
-        a {
-            float: right;
-            margin: 0 5px;
-            img {
-                margin: 0;
-            }
-        }
-    }
+//    & #logo {
+//        img {
+//            margin-bottom: 15px;
+//        }
+//    }
+//    & .search {
+//        input {
+//            height: 20px;
+//            width: 167px;
+//            padding: 0 8px;
+//            margin: 13px 0px 0px 18px;
+//            border-radius: 3px;
+//            font-size: 10px;
+//            color: $black;
+//            display: inline-block;
+//        }
+//        a {
+//            &.magnifying-glass {
+//                font-size: 10em; /* This controls the size. */ 
+//                display: inline-block; 
+//                width: rem-calc(10); 
+//                height: rem-calc(10);
+//                border: rem-calc(2) solid $d-blue; 
+//                position: relative; 
+//                border-radius: 0.35em;
+//                margin: 0 0 0 -25px;
+//                &:before {
+//                    content: ""; 
+//                    display: inline-block; 
+//                    position: absolute; 
+//                    right: rem-calc(-7); 
+//                    bottom: rem-calc(-4); 
+//                    border-width: 0; 
+//                    background: $d-blue; 
+//                    width: rem-calc(8); 
+//                    height: rem-calc(2); 
+//                    -webkit-transform: rotate(45deg); 
+//                    -moz-transform: rotate(45deg);
+//                    -ms-transform: rotate(45deg);
+//                    transform: rotate(45deg);
+//                }
+//            }
+//        }
+//    }
+//    #sec-nav {
+//        position: relative;
+//        text-align: left;
+//        padding: 10px 0;
+//        margin: 0 0 15px 45px;
+//        ul {
+//            margin: 0;
+//            li {
+//                display: inline;
+//                a {
+//                    font-size: 12px;
+//                    color: $d-blue;
+//                    padding: 0 5px;
+//                    font-weight: bold;
+//                }
+//            }
+//        }
+//        & > ul > li {
+//            position: relative;
+//            &:before {
+//                color: $aluminum;
+//                content: "|";
+//                position: absolute;
+//                top: 2px;
+//                left: -15px;
+//                font-size: 14px;
+//                font-weight: bold;
+//                display:block;
+//                padding: 0 10px;
+//            }
+//            &:first-child:before {
+//                content: none;
+//            }
+//        }
+//    }
+//    img {
+//        margin-left: 5px;
+//    }
+//    .social {
+//        margin-top: -25px;
+//        padding-right: 0;
+//        a {
+//            float: right;
+//            margin: 0 5px;
+//            img {
+//                margin: 0;
+//            }
+//        }
+//    }
 }

diff --git a/root/sections/footer.php b/root/sections/footer.php
index e7e0b35..6a62b43 100644 (file)
--- a/root/sections/footer.php
+++ b/root/sections/footer.php
@@ -1,9 +1,10 @@
- <footer class="main">
-    <?php if (is_active_sidebar('sidebar-f')) :?>
-        <?php dynamic_sidebar('sidebar-f');?>
-    <?php endif;?>
+<div id="space"></div> 
+<footer class="main">
     <div class="row">
-        <div id="footer_address" class="medium-12 columns show-for-medium">
+        <div class="small-12 small-centered large-uncentered large-4 columns small-text-center large-text-left">
+            <a href="#"><img alt="footer image"></a>
+        </div>
+        <div id="footer_address" class="medium-6 large-4  columns show-for-medium">
             <?php if (function_exists('glm_get_clientinfo_option')) :?>
 <!--                                    <h2><?php //echo glm_get_clientinfo_option('businessName');?></h2>-->
             <?php if (glm_get_clientinfo_option('address')):?>
@@ -36,5 +37,10 @@
             <?php endif;?>
             <?php endif;?>
         </div>
+        <div id="footer-widget" class="small-12 small-centered medium-uncentered medium-6 large-4 columns">
+            <?php if (is_active_sidebar('sidebar-f')) :?>
+                <?php dynamic_sidebar('sidebar-f');?>
+            <?php endif;?>
+        </div>
     </div>
 </footer>
\ No newline at end of file

diff --git a/root/sections/front-page.php b/root/sections/front-page.php
index 9f07b26..3ba5278 100644 (file)
--- a/root/sections/front-page.php
+++ b/root/sections/front-page.php
@@ -13,5 +13,10 @@
                 <?php get_template_part('parts/main-content');?>
             </div>
         </div>
+        <div class="row">
+            <div id="blog-feed" class="small-11 small-centered columns">
+                <?php //get_template_part('parts/blog-feed-home'); ?>
+            </div>
+        </div>
     </div>
 </main>
\ No newline at end of file

diff --git a/root/sections/header.php b/root/sections/header.php
index c15a852..38be909 100644 (file)
--- a/root/sections/header.php
+++ b/root/sections/header.php
@@ -1,5 +1,19 @@
-<header>
-    <div class="row">
-        
+<header class="main">
+    <div class="row  medium-uncollapse large-collapse">
+        <div id="logo-tag" class="small-12 text-center medium-12 columns">
+            <?php get_custom_logo($blog_id = 0 );?>
+            <?php the_custom_logo($blog_id = 0 );?>
+            <?php
+            if ( is_front_page() && is_home() ) : ?>
+                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+            <?php else : ?>
+                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+            <?php endif;
+            $description = get_bloginfo( 'description', 'display' );
+            if ( $description || is_customize_preview() ) : ?>
+                <h3 class="site-description"><?php echo $description; ?></h3>
+            <?php endif;
+            ?>
+        </div>
     </div>
 </header>
\ No newline at end of file

diff --git a/root/sections/off-canvas.php b/root/sections/off-canvas.php
index 53606b4..26e1c6b 100644 (file)
--- a/root/sections/off-canvas.php
+++ b/root/sections/off-canvas.php
@@ -8,9 +8,11 @@
     <?php glm_theme_mobile_off_canvas(); ?>
     <?php get_template_part('parts/search-form');?>
     <ul class="social menu">
+<!--
         <li><a class="facebook" target="_blank" href="#"></a></li>
         <li><a class="twitter" target="_blank" href="#"></a></li>
         <li><a class="pin" target="_blank" href="#"></a></li>
+-->
     </ul>
     <?php if (function_exists('glm_get_clientinfo_option')) :?>
     <ul class="vertical">