Site revamp. Details in notes below.
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 May 2017 20:14:49 +0000 (16:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 May 2017 20:14:49 +0000 (16:14 -0400)
Sub-menus are now clickable and only show certain selected sections
. Main nav items are still scrolling but quicker. No more static
top-nav. Smaller header. Navigation added to small view. Header
image added back to small view. Many changes for better responsive
layout.

assets/js/global.js
assets/js/navigation.js
front-page.php
header.php
index.php
style.css
template-parts/navigation/navigation-top.php

index 966b2f2..8fa8d39 100755 (executable)
                resizeTimer;
 
        // Ensure the sticky navigation doesn't cover current focused links.
-       $( 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]', '.site-content-contain' ).filter( ':visible' ).focus( function() {
-               if ( $navigation.hasClass( 'site-navigation-fixed' ) ) {
-                       var windowScrollTop = $( window ).scrollTop(),
-                               fixedNavHeight = $navigation.height(),
-                               itemScrollTop = $( this ).offset().top,
-                               offsetDiff = itemScrollTop - windowScrollTop;
-
-                       // Account for Admin bar.
-                       if ( $( '#wpadminbar' ).length ) {
-                               offsetDiff -= $( '#wpadminbar' ).height();
-                       }
-
-                       if ( offsetDiff < fixedNavHeight ) {
-                               $( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 0 );
-                       }
-               }
-       });
+//     $( 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]', '.site-content-contain' ).filter( ':visible' ).focus( function() {
+//             if ( $navigation.hasClass( 'site-navigation-fixed' ) ) {
+//                     var windowScrollTop = $( window ).scrollTop(),
+//                             fixedNavHeight = $navigation.height(),
+//                             itemScrollTop = $( this ).offset().top,
+//                             offsetDiff = itemScrollTop - windowScrollTop;
+//
+//                     // Account for Admin bar.
+//                     if ( $( '#wpadminbar' ).length ) {
+//                             offsetDiff -= $( '#wpadminbar' ).height();
+//                     }
+//
+//                     if ( offsetDiff < fixedNavHeight ) {
+//                             $( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 0 );
+//                     }
+//             }
+//     });
 
        // Set properties of navigation.
        function setNavProps() {
        }
 
        // Make navigation 'stick'.
-       function adjustScrollClass() {
-                
-               // Make sure we're not on a mobile screen.
-               //if ( 'none' === $menuToggle.css( 'display' ) ) {
-
-                       // Make sure the nav isn't taller than two rows.
-                       if ( navIsNotTooTall ) {
-                                
-                                
-                               // When there's a custom header image or video, the header offset includes the height of the navigation.
-                               if ( isFrontPage && ( $body.hasClass( 'has-header-image' ) || $body.hasClass( 'has-header-video' ) ) ) {
-//                                     headerOffset = $customHeader.innerHeight() - navigationOuterHeight;
-                                        
-                               } else {
-//                                     headerOffset = $customHeader.innerHeight();
-                               }
-
-                               // If the scroll is more than the custom header, set the fixed class.
-                               if ( $( window ).scrollTop() >= headerOffset ) {
-//                                     $navigation.addClass( navigationFixedClass );
-//                                     $navigationBottom.addClass( navigationFixedClass );
-                                       
-                               } else {
-                                       //$navigation.removeClass( navigationFixedClass );
-                                       //$navigationBottom.removeClass( navigationFixedClass );
-                               }
-
-                       } else {
-                                
-                               // Remove 'fixed' class if nav is taller than two rows.
-                               //$navigation.removeClass( navigationFixedClass );
-                               //$navigationBottom.removeClass( navigationFixedClass );
-                       }
-               //}   else {
-//                    console.log("Test Failed");
-//                }
-       }
+//     function adjustScrollClass() {
+//
+//             // Make sure we're not on a mobile screen.
+//             //if ( 'none' === $menuToggle.css( 'display' ) ) {
+//
+//                     // Make sure the nav isn't taller than two rows.
+//                     if ( navIsNotTooTall ) {
+//
+//
+//                             // When there's a custom header image or video, the header offset includes the height of the navigation.
+//                             if ( isFrontPage && ( $body.hasClass( 'has-header-image' ) || $body.hasClass( 'has-header-video' ) ) ) {
+////                                   headerOffset = $customHeader.innerHeight() - navigationOuterHeight;
+//
+//                             } else {
+////                                   headerOffset = $customHeader.innerHeight();
+//                             }
+//
+//                             // If the scroll is more than the custom header, set the fixed class.
+//                             if ( $( window ).scrollTop() >= headerOffset ) {
+////                                   $navigation.addClass( navigationFixedClass );
+////                                   $navigationBottom.addClass( navigationFixedClass );
+//
+//                             } else {
+//                                     //$navigation.removeClass( navigationFixedClass );
+//                                     //$navigationBottom.removeClass( navigationFixedClass );
+//                             }
+//
+//                     } else {
+//
+//                             // Remove 'fixed' class if nav is taller than two rows.
+//                             //$navigation.removeClass( navigationFixedClass );
+//                             //$navigationBottom.removeClass( navigationFixedClass );
+//                     }
+//             //}   else {
+////                    console.log("Test Failed");
+////                }
+//     }
 
        // Set margins of branding in header.
        function adjustHeaderHeight() {
-               if ( 'none' === $menuToggle.css( 'display' ) ) {
-
-                       // The margin should be applied to different elements on front-page or home vs interior pages.
-                       if ( isFrontPage ) {
-                               $branding.css( 'margin-bottom', navigationOuterHeight );
-                       } else {
-                               $customHeader.css( 'margin-bottom', navigationOuterHeight );
-                       }
-
-               } else {
-                       $customHeader.css( 'margin-bottom', '0' );
-                       $branding.css( 'margin-bottom', '0' );
-               }
+//             if ( 'none' === $menuToggle.css( 'display' ) ) {
+//
+//                     // The margin should be applied to different elements on front-page or home vs interior pages.
+//                     if ( isFrontPage ) {
+//                             $branding.css( 'margin-bottom', navigationOuterHeight );
+//                     } else {
+//                             $customHeader.css( 'margin-bottom', navigationOuterHeight );
+//                     }
+//
+//             } else {
+//                     $customHeader.css( 'margin-bottom', '0' );
+//                     $branding.css( 'margin-bottom', '0' );
+//             }
        }
 
        // Set icon for quotes.
 
        // Fire on document ready.
        $( document ).ready( function() {
-
+            $( '.panel-toggle').on('click',function() {
+                target = $(this).attr('id').split("-")[1];
+                parent_target = $(this).parents('.parent-container').attr('id').split("-")[1];
+                $('#nav-'+parent_target+' .page-nav-container li').removeClass("active");
+                $(this).parents('.page-nav-container li').toggleClass("active");
+
+                //alert("test");
+//                alert(parent_target);
+                $('#content-'+parent_target+' .page-content-container article:not(#page-'+target+')').addClass('inactive').removeClass('active');
+                $('#content-'+parent_target+' .page-content-container #page-'+target).toggleClass('inactive').toggleClass('active');
+            });
                // If navigation menu is present on page, setNavProps and adjustScrollClass.
-               if ( $navigation.length ) {
-                       setNavProps();
-                       adjustScrollClass();
-               }
+//             if ( $navigation.length ) {
+//                     setNavProps();
+//                     adjustScrollClass();
+//             }
 
                // If 'Scroll Down' arrow in present on page, calculate scroll offset and bind an event handler to the click event.
-               if ( $menuScrollDown.length ) {
-
-                       if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
-                               menuTop -= 32;
-                       }
-                       if ( $( 'body' ).hasClass( 'blog' ) ) {
-                               menuTop -= 30; // The div for latest posts has no space above content, add some to account for this.
-                       }
-                       if ( ! $navigation.length ) {
-                               navigationOuterHeight = 0;
-                       }
-
-                       $menuScrollDown.click( function( e ) {
-                               e.preventDefault();
-                               $( window ).scrollTo( '#primary', {
-                                       duration: 600,
-                                       offset: { top: menuTop - navigationOuterHeight }
-                               });
-                       });
-               }
-
-               adjustHeaderHeight();
+//             if ( $menuScrollDown.length ) {
+//
+//                     if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
+//                             menuTop -= 32;
+//                     }
+//                     if ( $( 'body' ).hasClass( 'blog' ) ) {
+//                             menuTop -= 30; // The div for latest posts has no space above content, add some to account for this.
+//                     }
+//                     if ( ! $navigation.length ) {
+//                             navigationOuterHeight = 0;
+//                     }
+//
+//                     $menuScrollDown.click( function( e ) {
+//                             e.preventDefault();
+//                             $( window ).scrollTo( '#primary', {
+//                                     duration: 600,
+//                                     offset: { top: menuTop - navigationOuterHeight }
+//                             });
+//                     });
+//             }
+
+//             adjustHeaderHeight();
                setQuotesIcon();
                if ( true === supportsInlineSVG() ) {
                        document.documentElement.className = document.documentElement.className.replace( /(\s*)no-svg(\s*)/, '$1svg$2' );
        if ( $navigation.length ) {
 
                // On scroll, we want to stick/unstick the navigation.
-               $( window ).on( 'scroll', function() {
-                       adjustScrollClass();
-                       adjustHeaderHeight();
-               });
-
-               // Also want to make sure the navigation is where it should be on resize.
-               $( window ).resize( function() {
-                       setNavProps();
-                       setTimeout( adjustScrollClass, 500 );
-               });
+//             $( window ).on( 'scroll', function() {
+//                     adjustScrollClass();
+//                     adjustHeaderHeight();
+//             });
+//
+//             // Also want to make sure the navigation is where it should be on resize.
+//             $( window ).resize( function() {
+//                     setNavProps();
+//                     setTimeout( adjustScrollClass, 500 );
+//             });
        }
 
        $( window ).resize( function() {
index 541cd61..74d026b 100755 (executable)
                        $( this ).parents( '.menu-item, .page_item' ).toggleClass( 'focus' );
                });
        })();
-        
-        console.log($(window).width());
-        
-        var myTopPosition = $(window).scrollTop() + 200;
-        
-        setActiveNavItem();
-        updateStaticNavPositions();
-
-        $(window).scroll(function() {
-            myTopPosition = $(window).scrollTop() + 200;
-            //var myBottomPosition = $(window).scrollTop() + $(window).height();
-            
-            setActiveNavItem();
-            updateStaticNavPositions();
 
-        });
-        
+//        console.log($(window).width());
+
+//        var myTopPosition = $(window).scrollTop() + 200;
+
+//        setActiveNavItem();
+//        updateStaticNavPositions();
+//
+//        $(window).scroll(function() {
+//            myTopPosition = $(window).scrollTop() + 200;
+//            //var myBottomPosition = $(window).scrollTop() + $(window).height();
+//
+//            setActiveNavItem();
+//            updateStaticNavPositions();
+//
+//        });
+
         $(".static-nav-link").click(function() {
-            
-            var myText = $($(this).attr("href"));
-            console.log(myText);
-            if (myText) {
+
+            var scrollTarget = $($(this).attr("href"));
+//            console.log(scrollTarget);
+            if (scrollTarget) {
                 $('body, html').animate({
-                    scrollTop: myText.offset().top-100
-                }, 1000);
+                    scrollTop: scrollTarget.offset().top-100
+                }, 300);
             }
-            
+
         });
-        
+
         function setActiveNavItem() {
-            $(".twentyseventeen-panel").each(function() {
-                if(myTopPosition > $(this).offset().top && ( $(this).offset().top + $(this).outerHeight() > myTopPosition) ) {
-                    $("body, html").find("#static-nav-" + $(this).attr("id")).addClass("active");
-                } else {
-                    $("body, html").find("#static-nav-" + $(this).attr("id")).removeClass("active");
-                }
-            });
+//            $(".twentyseventeen-panel").each(function() {
+//                if(myTopPosition > $(this).offset().top && ( $(this).offset().top + $(this).outerHeight() > myTopPosition) ) {
+//                    $("body, html").find("#static-nav-" + $(this).attr("id")).addClass("active");
+//                } else {
+//                    $("body, html").find("#static-nav-" + $(this).attr("id")).removeClass("active");
+//                }
+//            });
         }
-        
+
         function updateStaticNavPositions() {
-            currentActive = $('body, html').find(".static-nav-section .active");
-            
+//            currentActive = $('body, html').find(".static-nav-section .active");
+
             // Those code would be useful if the navigation is dynamically populated
             // but as it is only works while scrolling down (and doesn't correctly
             // place the items on page load)
-//            sectionCount = $(".static-nav-section").length;          
+//            sectionCount = $(".static-nav-section").length;
 //            $(".static-nav-section").each(function() {
 //                if ( $('body, html').find(".static-nav-section .active").length !== 0 ) {
 //                    if ( $(this).find(".active").length !== 0) {
 //
 //                }
 //            });
-            
-            if (currentActive.length !== 0) {
-                if ( $('#section-19').find(".active").length !== 0) {
-                    $('#section-19').detach().appendTo("#static-nav-top").show();
-                    $('#section-26').detach().appendTo("#static-nav-bottom").show();
-                    $('#section-28').hide();
-                } else if ( $('#section-26').find(".active").length !== 0) {
-                    $('#section-19').hide();
-                    $('#section-26').detach().appendTo("#static-nav-top").show();
-                    $('#section-28').detach().appendTo("#static-nav-bottom").show();
-                } else if ( $('#section-28').find(".active").length !== 0) {
-                    $('#section-19').hide();
-                    $('#section-28').detach().appendTo("#static-nav-bottom").show();
-                    $('#section-26').hide();    
-                }
-            } else {
-                $('#section-19').detach().appendTo("#static-nav-bottom");
-                $('#section-19').show();
-                $('#section-26').hide();
-                $('#section-28').hide();
-            }
+
+//            if (currentActive.length !== 0) {
+//                if ( $('#section-19').find(".active").length !== 0) {
+//                    $('#section-19').detach().appendTo("#static-nav-top").show();
+//                    $('#section-26').detach().appendTo("#static-nav-bottom").show();
+//                    $('#section-28').hide();
+//                } else if ( $('#section-26').find(".active").length !== 0) {
+//                    $('#section-19').hide();
+//                    $('#section-26').detach().appendTo("#static-nav-top").show();
+//                    $('#section-28').detach().appendTo("#static-nav-bottom").show();
+//                } else if ( $('#section-28').find(".active").length !== 0) {
+//                    $('#section-19').hide();
+//                    $('#section-28').detach().appendTo("#static-nav-bottom").show();
+//                    $('#section-26').hide();
+//                }
+//            } else {
+//                $('#section-19').detach().appendTo("#static-nav-bottom");
+//                $('#section-19').show();
+//                $('#section-26').hide();
+//                $('#section-28').hide();
+//            }
         }
-                
+
 })( jQuery );
index 079d361..85539d8 100755 (executable)
@@ -16,30 +16,121 @@ get_header(); ?>
 
 <div id="primary" class="content-area">
        <main id="main" class="site-main" role="main">
-                
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-                <div id="glm-button"></div>
-            
-            
-
-                
-               <?php // Show the selected frontpage content.
+
+            <?php
+                get_template_part( 'template-parts/page/content', 'front-page' );
                if ( have_posts() ) :
-                       while ( have_posts() ) : the_post();
-                               get_template_part( 'template-parts/page/content', 'front-page' );
-                       endwhile;
+
+//                                $locations = get_nav_menu_locations();
+//                                $menuSlug = "top";
+//                                $menu = wp_get_nav_menu_object( $locations[ $menuSlug ] );
+//                                $menu_items = wp_get_nav_menu_items($menu->term_id);
+//                                foreach ( (array) $menu_items as $key => $menu_item ) {
+//                                    if ( $menu_item->menu_item_parent == 0 ) :
+//                                        $title = $menu_item->title;
+//                                        $url = $menu_item->url;
+//                                        //echo print_r($menu_item);
+//                                        echo '<li><a class="static-nav-link" href="#post-'. $menu_item->object_id .'"> ' . $title . '</a></li>';
+//                                    endif;
+//                                }
+
+//                                wp_list_pages( );
+                                $parent_args = array(
+                                        'posts_per_page'   => 0,
+                                        'offset'           => 0,
+                                        'orderby'          => 'order',
+                                        'order'            => 'ASC',
+                                        'post_type'        => 'page',
+                                        'post_parent'      => '0',
+                                        'post_status'      => 'publish',
+                                        'suppress_filters' => false,
+                                        'post_name__in'         => ['services','portfolio','contact-us'],
+                                );
+                                $all_parents = get_posts( $parent_args );
+
+                                foreach ($all_parents as $a_parent) {
+//                                    echo print_r($a_post);
+//                                    if ( $a_parent->post_parent == 0) {
+                                        ?>
+
+                                        <hr class='content-separator'>
+                                        <div id="nav-<?php echo $a_parent->ID;?>" class="parent-container nav-parent">
+                                            <h1><?php echo $a_parent->post_title; ?></h1>
+
+                                        <?php
+                                            $child_args = array(
+                                                'posts_per_page'   => 0,
+                                                'offset'           => 0,
+                                                'orderby'          => 'order',
+                                                'order'            => 'ASC',
+                                                'post_type'        => 'page',
+                                                'post_parent'      => $a_parent->ID,
+                                                'post_status'      => 'publish',
+                                                'suppress_filters' => false
+                                            );
+                                            $child_posts = get_posts( $child_args );
+                                            if (count($child_posts) > 1) {
+                                        ?>
+                                            <ul class="page-nav-container">
+                                            <?php
+                                            $nav_count = 0;
+                                            foreach ($child_posts as $child_post) {
+                                                ?>
+                                                <li <?php if ($nav_count == 0) { echo "class='active'";}?>>
+                                                    <span id='toggle-<?php echo $child_post->ID; ?>' class=" panel-toggle"><?php echo $child_post->post_title; ?></span>
+                                                </li>
+                                                <?php
+                                                $nav_count++;
+                                            }
+                                            ?>
+                                            </ul>
+                                        <?php } ?>
+                                        </div>
+                                        <div id="content-<?php echo $a_parent->ID;?>" class="parent-container content-parent">
+                                            <ul class="page-content-container">
+                                                <?php
+                                                $content_count = 0;
+                                                foreach ($child_posts as $child_post) {
+                                                    ?>
+                                                    <li>
+                                                        <article id='page-<?php echo $child_post->ID; ?>' class='<?php if ($content_count !== 0) { echo "inactive";}?> twentyseventeen-panel page type-page hentry status-<?php echo $child_post->post_status; ?>' type-<?php echo $child_post->post_type; ?>>
+                                                            <div class='panel-content'>
+                                                                <div class='wrap'>
+                                                                    <header class="entry-header">
+                                                                        <h2 class="entry-title"><?php echo $child_post->post_title; ?></h2>
+                                                                    </header><!-- .entry-header -->
+                                                                    <div class="entry-content">
+
+                                                                        <p><?php echo apply_filters( 'the_content', get_post_field('post_content', $child_post->ID) ); ?></p>
+
+                                                                    </div><!-- .entry-content -->
+                                                                </div><!-- .wrap -->
+                                                            </div><!-- .panel-content -->
+                                                        </article>
+                                                    </li>
+                                                    <?php
+                                                    $content_count++;
+                                                }
+                                                ?>
+
+
+                                            </ul>
+                                        </div><!-- parent-container -->
+                                        <?php
+
+                                }
+
+
+
+//                     while ( have_posts() ) : the_post();
+//                             get_template_part( 'template-parts/page/content', 'front-page' );
+//                     endwhile;
                else : // I'm not sure it's possible to have no posts when this page is shown, but WTH.
-                       get_template_part( 'template-parts/post/content', 'none' );
+//                     get_template_part( 'template-parts/post/content', 'none' );
                endif; ?>
-                
+
                <?php
-                
+
                // Get each of our panels and show the post data.
                if ( 0 !== twentyseventeen_panel_count() || is_customize_preview() ) : // If we have pages to show.
 
@@ -56,7 +147,7 @@ get_header(); ?>
                        // Create a setting and control for each of the sections available in the theme.
                        for ( $i = 1; $i < ( 1 + $num_sections ); $i++ ) {
                                $twentyseventeencounter = $i;
-                               twentyseventeen_front_page_section( null, $i );
+//                             twentyseventeen_front_page_section( null, $i );
                        }
 
        endif; // The if ( 0 !== twentyseventeen_panel_count() ) ends here. ?>
index 63b4b07..90e8737 100755 (executable)
 <?php wp_head(); ?>
 </head>
 
-<body <?php body_class(); ?>>    
+<body <?php body_class(); ?>>
     <div id="top-nav">
         <div class="top-nav-left">
-            <img src="<?php bloginfo('template_url');?>/assets/images/header-logo.png">
+            <a href="">
+                <img src="<?php bloginfo('template_url');?>/assets/images/header-logo.png">
+            </a>
         </div>
         <div class="top-nav-right">
             <ul class="top-nav-right-list">
-                <?php 
-                    $locations = get_nav_menu_locations();
-                    $menuSlug = "top";
-                    $menu = wp_get_nav_menu_object( $locations[ $menuSlug ] );
-                    $menu_items = wp_get_nav_menu_items($menu->term_id);
-                    foreach ( (array) $menu_items as $key => $menu_item ) {
-                        if ( $menu_item->menu_item_parent == 0 ) :
-                            $title = $menu_item->title;
-                            $url = $menu_item->url;
-                            //echo print_r($menu_item);
-                            echo '<li><a class="static-nav-link" href="#post-'. $menu_item->object_id .'"> ' . $title . '</a></li>';
-                        endif;
+                <?php
+//                    $locations = get_nav_menu_locations();
+//                    $menuSlug = "top";
+//                    $menu = wp_get_nav_menu_object( $locations[ $menuSlug ] );
+//                    $menu_items = wp_get_nav_menu_items($menu->term_id);
+//                    foreach ( (array) $menu_items as $key => $menu_item ) {
+//                        if ( $menu_item->menu_item_parent == 0 ) :
+//                            $title = $menu_item->title;
+//                            $url = $menu_item->url;
+//                            //echo print_r($menu_item);
+//                            echo '<li><a class="static-nav-link" href="#nav-'. $menu_item->object_id .'"> ' . $title . '</a></li>';
+//                        endif;
+//                    }
+                    $nav_items_args = array(
+                            'posts_per_page'   => 0,
+                            'offset'           => 0,
+                            'orderby'          => 'order',
+                            'order'            => 'ASC',
+                            'post_type'        => 'page',
+                            'post_parent'      => '0',
+                            'post_status'      => 'publish',
+                            'post_name__in'         => ['services','portfolio','contact-us'],
+                    );
+                    $nav_items = get_posts( $nav_items_args );
+                    echo '<li><a class="static-nav-link" href="#frontpage-sub-title"> Home </a></li>';
+                    foreach ( $nav_items as $nav_item ) {
+                        echo '<li><a class="static-nav-link" href="#nav-'. $nav_item->ID .'"> ' . $nav_item->post_title . '</a></li>';
                     }
+
                 ?>
             </ul>
         </div>
 
                <?php get_template_part( 'template-parts/header/header', 'image' ); ?>
 
-               <?php if ( has_nav_menu( 'top' ) ) : ?>
-            
+               <?php // if ( has_nav_menu( 'top' ) ) : ?>
+<!--
                        <div class="navigation-top site-navigation-fixed">
                                <div class="wrap">
-                                       <?php get_template_part( 'template-parts/navigation/navigation', 'top' ); ?>
-                               </div><!-- .wrap -->
-                       </div><!-- .navigation-top -->
-                        
+                                       <?php // get_template_part( 'template-parts/navigation/navigation', 'top' ); ?>
+                               </div> .wrap
+                       </div> .navigation-top
+-->
                         <div class="navigation-bottom site-navigation-fixed">
                             <div class="wrap">
-                                <ul id="static-nav-bottom">
+                                <div id="static-nav-bottom">
 
-                                </ul>
+                                    <a class="static-nav-link static-nav-parent" href="#nav-28">contact us:</a>
+                                    <div id="static-nav-bottom-phone">
+                                        <span>p:</span><span id="contact-us-number"> 231-348-3950</span>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-                        
-               <?php endif; ?>
+
+               <?php // endif; ?>
 
        </header><!-- #masthead -->
 
index 78d1b4c..d21a560 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -34,17 +34,34 @@ get_header(); ?>
                        <?php
                        if ( have_posts() ) :
 
-                               /* Start the Loop */
-                               while ( have_posts() ) : the_post();
 
-                                       /*
-                                        * Include the Post-Format-specific template for the content.
-                                        * If you want to override this in a child theme, then include a file
-                                        * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-                                        */
-                                       get_template_part( 'template-parts/post/content', get_post_format() );
 
-                               endwhile;
+                                $locations = get_nav_menu_locations();
+                                $menuSlug = "top";
+                                $menu = wp_get_nav_menu_object( $locations[ $menuSlug ] );
+                                $menu_items = wp_get_nav_menu_items($menu->term_id);
+                                foreach ( (array) $menu_items as $key => $menu_item ) {
+                                    if ( $menu_item->menu_item_parent == 0 ) :
+                                        $title = $menu_item->title;
+                                        $url = $menu_item->url;
+                                        //echo print_r($menu_item);
+                                        echo '<li><a class="static-nav-link" href="#post-'. $menu_item->object_id .'"> ' . $title . '</a></li>';
+                                    endif;
+                                }
+
+                                wp_list_pages( );
+
+                               /* Start the Loop */
+//                             while ( have_posts() ) : the_post();
+//
+//                                     /*
+//                                      * Include the Post-Format-specific template for the content.
+//                                      * If you want to override this in a child theme, then include a file
+//                                      * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+//                                      */
+//                                     get_template_part( 'template-parts/post/content', get_post_format() );
+//
+//                             endwhile;
 
                                the_posts_pagination( array(
                                        'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
index 072bf99..d4529df 100755 (executable)
--- a/style.css
+++ b/style.css
@@ -1523,6 +1523,30 @@ a:hover .nav-title,
     margin: 0 auto;
     padding: 0;
 }
+#static-nav-bottom {
+    margin: 0 auto;
+    max-width: 1200px;
+    width: 100%;
+}
+#static-nav-bottom .static-nav-link {
+    float: left;
+}
+#static-nav-bottom #static-nav-bottom-phone {
+    float: left;
+}
+#static-nav-bottom a {
+    font-size: 26px;
+}
+.wrap #static-nav-bottom .static-nav-parent {
+    float: left;
+    font-size: 28px;
+    left: 10px;
+    line-height: 1;
+    margin-right: 20px;
+    padding: 5px;
+    position: absolute;
+}
+
 .static-nav-section li {
     float: left;
     list-style: outside none none;
@@ -1552,27 +1576,30 @@ a:hover .nav-title,
 }
 .wrap .static-nav-parent {
     float: left;
-    font-size: 40px;
+    font-size: 35px;
     left: -50px;
     line-height: 1;
     margin-right: 20px;
-    padding: 10px;
+    padding: 5px;
     position: absolute;
 }
 .static-nav-section > ul > li {
     font-size: 18px;
-    padding: 20px 0;
+    padding: 10px 0;
 }
 .top-nav-left {
     float: left;
 }
+.top-nav-left > img {
+    height: 50px;
+}
 .top-nav-right {
     float: right;
 }
 .top-nav-right li {
     float: left;
     list-style: outside none none;
-    margin-top: 50px;
+    margin-top: 10px;
 }
 .top-nav-right li::after {
     content: "|";
@@ -1605,25 +1632,34 @@ a:hover .nav-title,
     letter-spacing: 0;
     text-align: center;
 }
-#contact-us-footer {
+#static-nav-bottom #static-nav-bottom-phone {
     float: none;
+    margin: 0 auto;
     text-align: center;
+    font-size: 18px;
+    padding: 10px 0;
 }
-#contact-us-footer span {
+@media screen and (max-width: 768px) {
+    #static-nav-bottom #static-nav-bottom-phone {
+        float: right;
+        width: 50%;
+    }
+}
+#static-nav-bottom-phone span {
     color: #000000;
 }
-#contact-us-footer #contact-us-number {
+#static-nav-bottom-phone #contact-us-number {
     color: #666666;
 }
 .navigation-bottom .wrap {
     padding: 0;
 }
-@media screen and (max-width: 640px) {
-    .site-navigation-fixed {
+@media screen and (max-width: 768px) {
+/*    .site-navigation-fixed {
         display: none;
-    }
+    }*/
     .panel-content .wrap {
-        margin-top: 0;
+/*        margin-top: 50px;*/
     }
 }
 @media screen and (max-width: 1280px) {
@@ -1631,7 +1667,7 @@ a:hover .nav-title,
 
        .home .site-navigation-fixed.navigation-top {
                bottom: auto;
-               position: fixed;
+               position: relative;
                left: 0;
                right: 0;
                top: 140px;
@@ -1649,7 +1685,7 @@ a:hover .nav-title,
                right: 0;
                width: 100%;
                z-index: 7;
-                height: 80px;
+                height: 50px;
                 background-color: #fff;
                 border-top: 2px solid black;
        }
@@ -1694,7 +1730,7 @@ a:hover .nav-title,
         margin: 10px 0;
     }
     .home .top-nav-right li::after {
-        padding: 15px;
+        padding: 5px;
     }
     .home .top-nav-right-list {
         clear: both;
@@ -1702,12 +1738,12 @@ a:hover .nav-title,
         height: 50px;
         margin: 0 auto;
         text-align: center;
-        width: 320px;
+        width: 340px;
     }
     .home #top-nav {
         background-color: white;
         border-bottom: 2px solid black;
-        height: 90px;
+        height: 65px;
         padding-top: 7px;
         padding-left: 0;
         position: fixed;
@@ -1724,9 +1760,12 @@ a:hover .nav-title,
     .home .static-nav-section {
         padding: 6px;
     }
-    .panel-content .wrap {
-        margin-top: 80px;
-    }
+/*    .panel-content .wrap {
+        margin-top: 30px;
+    }*/
+/*    #frontpage-sub-title {
+        margin-top: 50px;
+    }*/
     .home .static-nav-section > ul > li {
         font-size: 16px;
         padding: 0;
@@ -1793,13 +1832,16 @@ body {
 #top-nav {
     background-color: white;
     border-bottom: 2px solid black;
-    height: 90px;
+    height: 65px;
     padding-left: 25px;
     padding-top: 7px;
     position: fixed;
     width: 100%;
     z-index: 9;
 }
+.top-nav-left img {
+    height: 50px;
+}
 
 #masthead .wrap {
        position: relative;
@@ -2019,11 +2061,12 @@ body:not(.title-tagline-hidden) .site-branding-text {
                -webkit-transform: none;
                transform: none;
                width: 100%;
+                min-width: 640px;
        }
 }
 @media screen and (max-width: 1280px) {
     .has-header-image .custom-header-media img {
-        top: 100px;
+        top: 70px;
     }
 }
 
@@ -2049,10 +2092,115 @@ body:not(.has-header-image):not(.has-header-video) .custom-header-media {
 .twentyseventeen-front-page .site-content {
        padding: 0;
 }
+@media (max-width: 767px) {
+    .twentyseventeen-front-page .site-content {
+        padding: 0;
+        margin-top: 248px;
+    }
+}
+
+.parent-container {
+    display: table;
+    margin: 0 auto;
+    text-align: center;
+}
+.parent-container.content-parent {
+        max-width: 1000px;
+        width: 100%;
+}
+.nav-parent {
+}
+.content-separator {
+    max-width: 1000px;
+    margin: 20px auto;
+}
+@media screen and (min-width: 1000px) {
+
+}
+.parent-container ul,
+.parent-container ul li {
+    list-style: none;
+}
+.parent-container h1 {
+    font-size: 60px;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+@media screen and (max-width: 768px) {
+    .parent-container h1 {
+        font-size: 48px;
+    }
+}
+.parent-container .entry-content h1 {
+    font-size: 32px;
+}
+.page-nav-container {
+    clear: both;
+    float: none;
+    list-style: none;
+}
+.page-nav-container li {
+    display: inline;
+    cursor: pointer;
+    border: 1px solid lightgrey;
+    float: left;
+    list-style: outside none none;
+}
+@media screen and (max-width: 768px) {
+    .page-nav-container li {
+        width: 100%;
+        text-align: center;
+    }
+}
+.page-nav-container li:hover {
+    background-color: #f3f3f3;
+}
+.page-nav-container li.active {
+    background-color: #f3f3f3;
+}
+.page-content-container {
+    clear: both;
+}
 
 .twentyseventeen-panel {
-       overflow: hidden;
-       position: relative;
+    overflow: hidden;
+    position: relative;
+}
+.page-content-container .page .panel-content .wrap {
+    padding: 0 3em;
+}
+@media screen and (max-width: 768px) {
+    .page-content-container .page .panel-content .wrap {
+        padding: 0 1em;
+    }
+}
+.entry-content {
+    text-align: left;
+}
+.page.page-one-column .panel-content .wrap .entry-header {
+    margin-top: 30px;
+    margin-bottom: 15px;
+}
+
+.twentyseventeen-panel.inactive {
+    display: none;
+}
+.twentyseventeen-panel.active {
+    display: block;
+}
+.panel-toggle {
+    float: left;
+    display: block;
+    padding: 10px;
+}
+@media screen and (max-width: 768px) {
+    .panel-toggle {
+        float: none;
+        padding: 2px 12px;
+    }
+}
+#content-26 {
+  max-width: 1200px;
 }
 
 .panel-image {
@@ -3485,6 +3633,9 @@ object {
        .page-one-column .panel-content .wrap {
                max-width: 1000px;
        }
+        #content-26 .panel-content .wrap {
+            max-width: 1200px;
+        }
 
        .panel-content .entry-header {
                margin-bottom: 4.5em;
@@ -3691,10 +3842,10 @@ object {
 
        .site-navigation-fixed.navigation-top {
                bottom: auto;
-               position: fixed;
+               position: relative;
                left: 0;
                right: 0;
-               top: 88px;
+               top: 0px;
                width: 100%;
                z-index: 7;
        }
@@ -3705,7 +3856,7 @@ object {
                right: 0;
                width: 100%;
                z-index: 7;
-                height: 80px;
+                height: 50px;
        }
 
        .admin-bar .site-navigation-fixed.navigation-top {
@@ -3955,7 +4106,7 @@ object {
 
        .panel-content .wrap {
                padding-bottom: 4.5em;
-               padding-top: 6em;
+               padding-top: 3em;
        }
 
        .panel-image {
index 6d6741c..2f769a4 100755 (executable)
 //             'theme_location' => 'top',
 //             'menu_id'        => 'top-menu',
 //     ) ); ?>
-        
-        
-        
-        
+
+
+
+
        <?php // if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
 <!--           <a href="#content" class="menu-scroll-down">//<?php // echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php // _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>-->
        <?php // endif; ?>
-                
-                
-                                <?php 
-                
-                    $parents = array(
-                        19,
-                        26,
-                        28
-                    );
-                    
-                    echo "<ul id='static-nav-top' class='static-nav '>";
-                    foreach ($parents as $parent_id) {
-                        $all_ids[] = $parent_id;
-                        $parent_page = get_post($parent_id);
-                        echo "<li id='section-" . $parent_id . "' class='static-nav-section'>";
-                        
-                        echo "<a class='static-nav-link static-nav-parent' href='#post-" . $parent_id . "'>";
-                        echo strtolower($parent_page->post_title) . ":";
-                        echo "</a>";
-                        $children = get_child_pages_by_parent_id($parent_id);
-                        echo "<ul>";
-                        
-                        foreach ($children as $child_page) {
-                            $all_ids[$parent_id][] = $child_page->ID;
-                            echo "<li>";
-                            echo "<span id='static-nav-post-" . $child_page->ID. "' class='static-nav-link' href='#post-" . $child_page->ID . "'>";
-                            echo strtolower($child_page->post_title);
-                            echo "</span>";
-                            echo "</li>";
-                        }
-                        
-                        if ($parent_id == 28) {
-                            echo "<li id='contact-us-footer'><span>p:</span><span id='contact-us-number'> 231-348-3950</span></li>";
-                        }
-                        echo "</ul>";
-                        echo "<br>";
-                        echo "</li>";
-                    }
-                    echo "</ul>";
+
+
+                                <?php
+
+//                    $parents = array(
+//                        19,
+//                        26,
+//                        28
+//                    );
+//
+//                    echo "<ul id='static-nav-top' class='static-nav '>";
+//                    foreach ($parents as $parent_id) {
+//                        $all_ids[] = $parent_id;
+//                        $parent_page = get_post($parent_id);
+//                        echo "<li id='section-" . $parent_id . "' class='static-nav-section'>";
+//
+//                        echo "<a class='static-nav-link static-nav-parent' href='#post-" . $parent_id . "'>";
+//                        echo strtolower($parent_page->post_title) . ":";
+//                        echo "</a>";
+//                        $children = get_child_pages_by_parent_id($parent_id);
+//                        echo "<ul>";
+//
+//                        foreach ($children as $child_page) {
+//                            $all_ids[$parent_id][] = $child_page->ID;
+//                            echo "<li>";
+//                            echo "<span id='static-nav-post-" . $child_page->ID. "' class='static-nav-link' href='#post-" . $child_page->ID . "'>";
+//                            echo strtolower($child_page->post_title);
+//                            echo "</span>";
+//                            echo "</li>";
+//                        }
+//
+//                        if ($parent_id == 28) {
+//                            echo "<li id='contact-us-footer'><span>p:</span><span id='contact-us-number'> 231-348-3950</span></li>";
+//                        }
+//                        echo "</ul>";
+//                        echo "<br>";
+//                        echo "</li>";
+//                    }
+//                    echo "</ul>";
                 ?>
-                
-    
+
+
 </nav><!-- #site-navigation -->