Nav Toggle v.1

janczizikow · Jan 13, 2018 · 8251bd5 · 8251bd5
1 parent 9f98808
commit 8251bd5
Show file tree

Hide file tree

Showing 16 changed files with 489 additions and 271 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,6 @@
 title: Sleek # your site title
 author: GitHub User
-email: [email protected] # email be used for form submission
+email: [email protected] # email for form submission, you also have to change it in _js/scripts.js
 description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
@@ -31,10 +31,13 @@ exclude:
   - README.md
   - node_modules
   - package.json
+  - package-lock.json
   - Gemfile
   - Gemfile.lock
   - vendor
   - npm-debug.log
+  - gulpfile.js
+  - sleek.png
 
 include: ['_pages']
 permalink: /:title/

diff --git a/_includes/critical.css b/_includes/critical.css
diff --git a/_includes/header.html b/_includes/header.html
@@ -7,9 +7,13 @@
         </div>
       </a>
       <nav class="header__links">
-        <a class="header__link" href="{{ '/' | relative_url }}" itemprop="url"><span itemprop="name">Home</span></a>
-        <a class="header__link" href="{{ '/about' | relative_url }}" itemprop="url"><span itemprop="name">About</span></a>
-        <a class="header__link" href="{{ '/contact' | relative_url }}" itemprop="url"><span itemprop="name">Contact</span></a>
+        <div class="container header__links-wrapper">
+          <a class="header__link" href="{{ '/' | relative_url }}" itemprop="url"><span itemprop="name">Home</span></a>
+          <a class="header__link" href="{{ '/about' | relative_url }}" itemprop="url"><span itemprop="name">About</span></a>
+          <a class="header__link" href="{{ '/contact' | relative_url }}" itemprop="url">
+            <span itemprop="name">Contact</span>
+          </a>
+        </div>
       </nav>
       <div class="header__toggle">
         <span></span>

diff --git a/_js/scripts.js b/_js/scripts.js
@@ -1,12 +1,9 @@
 /*eslint-env jquery*/
-// log what was clicked (only for dev)
-// $( document ).click( function( e ) {
-//     console.log( e.target );
-// } );
 
 // Jquery & Velocity JS included in GULP
 $( document ).ready( function() {
 
+    toggleMobileNav();
     ShowHideNav();
     formCheck();
 
@@ -17,18 +14,78 @@ $( document ).keyup( function( e ) {
     e.keyCode === 27 ? removeModal() : null;
 } );
 
+$( window ).resize( function() {
+    $( ".header" ).removeClass( "hide-nav" ); // Ensure nav will be shown on resize
+    $( ".header__links" ).removeAttr( "style" ); // If mobile nav was collapsed, make sure it's show on DESK
+    $( ".header__overlay" ).remove();
+} );
+
+// Toggle Mobile Navigation
+function toggleMobileNav() {
+    $( ".header__toggle" ).click( function() {
+
+        if ( $( ".header__links" ).hasClass( "js--open" ) ) {
+            hideMobileNav();
+        }
+        else {
+            openMobileNav();
+        }
+    } );
+
+    $( ".header__overlay" ).click( function() {
+        hideMobileNav();
+    } );
+}
+
+function openMobileNav() {
+    $( ".header__links" ).velocity( "slideDown", {
+        duration: 300,
+        easing: "ease-out",
+        display: "block",
+        visibility: "visible",
+        begin: function() {
+            $( ".header__toggle" ).addClass( "--open" );
+            $( "body" ).append( "<div class='header__overlay'></div>" );
+        },
+        progress: function () {
+            $( ".header__overlay" ).addClass( "--open" );
+        },
+        complete: function() {
+            $( this ).addClass( "js--open" );
+        }
+    } );
+}
+
+function hideMobileNav() {
+    $( ".header__overlay" ).remove();
+    $( ".header__links" ).velocity( "slideUp", {
+        duration: 300,
+        easing: "ease-out",
+        display: "none",
+        visibility: "hidden",
+        begin: function() {
+            $( ".header__toggle" ).removeClass( "--open" );
+        },
+        progress: function () {
+            $( ".header__overlay" ).removeClass( "--open" );
+        },
+        complete: function() {
+            $( this ).removeClass( "js--open" );
+            $( ".header__toggle, .header__overlay" ).removeClass( "--open" );
+        }
+    } );
+}
 
 // SHOW/HIDE NAV
 function ShowHideNav() {
     var previousScroll = 0, // previous scroll position
         $header = $( ".header" ), // just storing header in a variable
         navHeight = $header.outerHeight(), // nav height
-        detachPoint = 650, // after scroll past this nav will be hidden
+        detachPoint = 576 + 60, // after scroll past this nav will be hidden
         hideShowOffset = 6; // scroll value after which nav will be shown/hidden
 
     $( window ).scroll( function() {
         var wW = 1024;
-
         // if window width is more than 1024px start show/hide nav
         if ( $( window ).width() >= wW ) {
             if ( !$header.hasClass( "fixed" ) ) {
@@ -41,26 +98,27 @@ function ShowHideNav() {
                     // if scrolled past detach point -> show nav
                     if ( currentScroll > detachPoint ) {
                         if ( !$header.hasClass( "fix-nav" ) ) {
-$header.addClass( "fix-nav" );
-}
+                            $header.addClass( "fix-nav" );
+                        }
                     }
+
                     if ( scrollDifference >= hideShowOffset ) {
                         if ( currentScroll > previousScroll ) {
 
                             // scroll down -> hide nav
                             if ( !$header.hasClass( "hide-nav" ) ) {
-$header.addClass( "hide-nav" );
+                                $header.addClass( "hide-nav" );
 }
                         } else {
 
                             // scroll up -> show nav
                             if ( $header.hasClass( "hide-nav" ) ) {
-$( $header ).removeClass( "hide-nav" );
-}
+                                $( $header ).removeClass( "hide-nav" );
+                            }
                         }
                     }
-                } else {
-
+                }
+                else {
                     // at the top
                     if ( currentScroll <= 0 ) {
                         $header.removeClass( "hide-nav show-nav" );
@@ -83,10 +141,6 @@ $( $header ).removeClass( "hide-nav" );
     } );
 }
 
-// Ensure nav will be shown on resize
-$( window ).resize( function() {
-    $( ".header" ).removeClass( "hide-nav" );
-} );
 
 function openModal() {
     $( "body" ).css( "overflow", "hidden" );