From dc4f0a69394612466c1d8f50a4aeabc64ca8a2c1 Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.ca>
Date: Sat, 16 Sep 2017 12:33:17 -0300
Subject: [PATCH] Some header and footer improvements.

---
 app/controllers/App.php                      |  4 +--
 resources/assets/scripts/routes/common.js    |  6 ++--
 resources/assets/styles/layouts/_footer.scss |  6 ++--
 resources/assets/styles/layouts/_header.scss | 33 ++++++++++----------
 resources/views/partials/footer.blade.php    |  8 ++---
 resources/views/partials/header.blade.php    |  8 ++---
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/app/controllers/App.php b/app/controllers/App.php
index 419d5ce..7aa1dd2 100644
--- a/app/controllers/App.php
+++ b/app/controllers/App.php
@@ -38,9 +38,9 @@ class App extends Controller
                 || get_option('pb_network_twitter')
                 || is_active_sidebar("network-footer-block-$index")
             ) {
-                return "network-footer-block-$index";
+                return "network-footer__block--$index";
             } else {
-                return 'empty';
+                return 'network-footer__block--empty';
             }
         }
         return (is_active_sidebar("network-footer-block-$index")) ? "network-footer-block-$index" : 'empty';
diff --git a/resources/assets/scripts/routes/common.js b/resources/assets/scripts/routes/common.js
index 6a5a86e..a3587bc 100644
--- a/resources/assets/scripts/routes/common.js
+++ b/resources/assets/scripts/routes/common.js
@@ -2,10 +2,10 @@ export default {
   init() {
     // JavaScript to be fired on all pages
     $('body').removeClass('no-js').addClass('js');
-    $('.toggle-menu').click((event) => {
+    $('.toggle').click((event) => {
       event.preventDefault();
-      $(event.currentTarget).toggleClass('is-active');
-      $('.primary-navigation').toggleClass('is-visible');
+      $(event.currentTarget).toggleClass('toggle--active');
+      $('.banner__navigation').toggleClass('banner__navigation--visible');
     });
   },
   finalize() {
diff --git a/resources/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss
index 4d95c32..3510f89 100644
--- a/resources/assets/styles/layouts/_footer.scss
+++ b/resources/assets/styles/layouts/_footer.scss
@@ -1,4 +1,4 @@
-.content-info {
+.footer {
   .network-footer {
     margin-bottom: 0;
     padding: 60px 42.5px 40px;
@@ -27,7 +27,7 @@
       }
     }
 
-    .network-footer-block.empty {
+    &__block {
       display: none;
     }
 
@@ -39,7 +39,7 @@
       border-top: solid 1px var(--accent-fg, $white);
     }
 
-    .network-footer-block-1 {
+    .network-footer__block-1 {
       margin: 0 -5px;
       padding: 0 0 40px;
     }
diff --git a/resources/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss
index 28567c8..e94c9ef 100644
--- a/resources/assets/styles/layouts/_header.scss
+++ b/resources/assets/styles/layouts/_header.scss
@@ -13,7 +13,7 @@
     max-width: 1440px;
   }
 
-  .toggle-menu {
+  .toggle {
     display: block;
     position: absolute;
     top: 30px;
@@ -23,7 +23,7 @@
     z-index: 99;
     text-indent: -9999em;
 
-    .icon {
+    &__icon {
       display: block;
       position: absolute;
       top: 7px;
@@ -52,18 +52,19 @@
       }
     }
 
-    &.is-active .icon {
-      // TODO
-      background: var(--primary-fg, $white);
-
-      &::before,
-      &::after {
+    &--active {
+      .toggle__icon {
         background: var(--primary-fg, $white);
+
+        &::before,
+        &::after {
+          background: var(--primary-fg, $white);
+        }
       }
     }
   }
 
-  .brand {
+  &__brand {
     display: block;
     align-self: flex-start;
     width: 6.5625rem;
@@ -78,7 +79,7 @@
     }
   }
 
-  .primary-navigation {
+  &__navigation {
     display: flex;
     position: absolute;
     flex-direction: column;
@@ -104,7 +105,7 @@
       display: none;
     }
 
-    &.is-visible {
+    &--visible {
       margin: 0;
       padding: 0 52px;
       z-index: 1;
@@ -122,7 +123,7 @@
     }
   }
 
-  .branding {
+  &__branding {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -147,18 +148,18 @@
       margin: 0 auto;
     }
 
-    .toggle-menu {
+    .toggle {
       display: none;
     }
 
-    .brand {
+    &__brand {
       align-self: center;
       width: 16.5625rem;
       height: auto;
       margin-top: 40px;
     }
 
-    .primary-navigation {
+    &__navigation {
       top: 40px;
       height: 40px;
       max-width: 1440px;
@@ -193,7 +194,7 @@
       }
     }
 
-    .branding {
+    &__branding {
       height: 576px;
 
       p {
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index 6aedce9..9748d92 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -1,15 +1,15 @@
-<footer class="content-info">
+<footer class="footer">
   <div class="container">
     @if(get_option('pb_network_contact_form'))
       @include('partials.contact-form')
     @endif
     <section class="network-footer">
-      <div class="network-footer-block {{ App::networkFooter(1) }}">
+      <div class="network-footer__block {{ App::networkFooter(1) }}">
         @if(App::networkFooter(1) !== 'empty')
             @php(dynamic_sidebar('network-footer-block-1'))
         @endif
       </div>
-      <div class="network-footer-block {{ App::networkFooter(2) }}">
+      <div class="network-footer__block {{ App::networkFooter(2) }}">
         @if(App::networkFooter(2) !== 'empty')
           @php(dynamic_sidebar('network-footer-block-2'))
         @endif
@@ -26,7 +26,7 @@
           @endif
         </div>
       </div>
-      <div class="network-footer-block network-footer-menu">
+      <div class="network-footer__block network-footer__menu">
         @php(wp_nav_menu('network-footer-menu'))
       </div>
     </section>
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 79ac6ea..a1ec38a 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -4,9 +4,9 @@
   @asset('images/catalog-header.jpg')
 @endif);">
   <div class="container">
-    <a class="toggle-menu" href="#primary-navigation">{{ __('Toggle menu', 'aldine') }}<span class="icon"></span></a>
-    <a class="brand" href="{{ home_url('/') }}"><span class="clip">{{ get_bloginfo('name', 'display') }}</span>{!! $site_logo !!}</a>
-    <nav id="primary-navigation" class="primary-navigation">
+    <a class="toggle" href="#navigation">{{ __('Toggle menu', 'aldine') }}<span class="toggle__icon"></span></a>
+    <a class="banner__brand" href="{{ home_url('/') }}"><span class="clip">{{ get_bloginfo('name', 'display') }}</span>{!! $site_logo !!}</a>
+    <nav class="banner__navigation" id="navigation">
         <a href="{{ home_url('/catalog') }}">Catalog</a>
         <a href="#contact">Contact</a>
         @if(!is_user_logged_in())
@@ -19,7 +19,7 @@
           <a href="{{ wp_logout_url() }}">{{ __('Sign out', 'aldine') }}</a>
         @endif
     </nav>
-    <header class="branding">
+    <header class="banner__branding">
       <h1><a href="{{ home_url('/') }}">{{ get_bloginfo('name', 'display') }}</a></h1>
       <p>{{ get_bloginfo('description', 'display') }}</p>
     </header>