From ddb3df7127407fdd135cd9c1b3cdaeae191d0953 Mon Sep 17 00:00:00 2001
From: harry <harry@outlandish.com>
Date: Thu, 25 Apr 2019 14:17:00 +0100
Subject: [PATCH] Moved About, Join and Manifesto to the header. Added a close
 button to the default page layout

---
 Gemfile.lock                                  | 28 +++++++++----------
 _includes/header.html                         |  1 +
 _layouts/home.html                            | 13 +++++----
 .../coop-tech-oowp-theme/public/css/app.css   |  7 ++++-
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 03146a3..a43925e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.1)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.10.0)
     forwardable-extended (2.6.0)
-    geocoder (1.5.0)
+    geocoder (1.5.1)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -30,10 +30,10 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (2.1.2)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -41,14 +41,14 @@ GEM
     mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (2.2.1)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.7.2)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -62,4 +62,4 @@ DEPENDENCIES
   jekyll
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/_includes/header.html b/_includes/header.html
index 6b96688..569477c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -8,6 +8,7 @@
           </a>
         </strong>
         <a class="back" href="/">&#8592; Go Back</a>
+        <a class="close" href="/">&#10006;</a>
       </div>
     </div>
   </div>
diff --git a/_layouts/home.html b/_layouts/home.html
index 965ac0d..523fdce 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -22,11 +22,14 @@
         <div id="responsive-menu">
           <div class="top-bar-right">
             <ul class="dropdown menu vertical medium-horizontal" data-magellan>
-              <li><a href="#members">Members</a></li>
-              <li><a href="#clients">Clients</a></li>
-              <li><a href="#services">Services</a></li>
-              <li><a href="#technologies">Technologies</a></li>
-              <li><a href="#contact" class="button">Get In Touch</a></li>
+              <li><a href="/#members">Members</a></li>
+              <li><a href="/#clients">Clients</a></li>
+              <li><a href="/#services">Services</a></li>
+              <li><a href="/#technologies">Technologies</a></li>
+              <li><a href="/about">About</a></li>
+              <li><a href="/join">Join</a></li>
+              <li><a href="/manifesto">Manifesto</a></li>
+              <li><a href="/#contact" class="button">Get In Touch</a></li>
             </ul>
           </div>
         </div>
diff --git a/app/themes/coop-tech-oowp-theme/public/css/app.css b/app/themes/coop-tech-oowp-theme/public/css/app.css
index 9598c81..cf0ddae 100644
--- a/app/themes/coop-tech-oowp-theme/public/css/app.css
+++ b/app/themes/coop-tech-oowp-theme/public/css/app.css
@@ -6346,7 +6346,9 @@ table.hover tbody tr:nth-of-type(even):hover {
 
 .top-bar-title {
   float: left;
-  margin-right: 1rem; }
+  margin-right: 1rem;
+  width: 100%;
+}
 
 .top-bar-left {
   float: left; }
@@ -6828,6 +6830,9 @@ h5#join-us {
   padding-left: 2rem;
   color: #9196a2; }
 
+.close{
+  float: right;
+}
 #page-banner {
   margin-bottom: 4rem;
   text-align: center; }