Merge branch 'master' of git.coop:cotech/website

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)
+    rb-inotify (0.10.0)
-      ffi (>= 0.5.0, < 2)
+      ffi (~> 1.0)
-    rouge (2.2.1)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
-    sass (3.7.2)
+    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

_coops/co-operative-web.md

@@ -52,10 +52,10 @@ technologies:
 - centos
 - express-js
 - gitlab
-- google-maps
 - htmlcss
 - java
 - javascript
+- laravel
 - mysql
 - nginx
 - node-js

_coops/outlandish.md

@@ -70,6 +70,7 @@ technologies:
 - aws-redshift
 - symfony
 - wordpress
+- laravel
 ---
 
 Outlandish is made up of around 20 collaborators and co-owners who love quality code, and apps that challenge the status quo.

_includes/head.html

@@ -2,6 +2,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 {% if page.excerpt %}
   <meta name="description" content="{{ page.excerpt | strip_html }}" />
+{% elsif page.content %}
+  <meta name="description" content="{{ page.content | strip_html | strip_newlines | condense_spaces | truncate:150 }}" />
 {% else %}
   <meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
 {% endif %}
@@ -15,7 +17,17 @@
   <meta property="og:description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
 {% endif %}
   <meta property="og:site_name" content="Cooperative Technologists" />
+{% if page.collection == 'coops' %}
+  <meta property="og:image" content="/images/coops/{{ page.slug }}" />
+{% elsif page.collection == 'services' %}
+  <meta property="og:image" content="/images/services/{{ page.slug }}" />
+{% elsif page.collection == 'technologies' %}
+  <meta property="og:image" content="/images/technologies/{{ page.slug }}" />
+{% elsif page.collection == 'clients' %}
+  <meta property="og:image" content="/images/clients/{{ page.slug }}" />
+{% else %}
   <meta property="og:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
+{% endif %}
   <meta property="og:locale" content="en_GB" />
   <meta name="twitter:card" content="summary" />
   <meta name="twitter:site" content="@CotechUK" />

_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>

_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="/#members">Members</a></li>
-              <li><a href="#clients">Clients</a></li>
+              <li><a href="/#clients">Clients</a></li>
-              <li><a href="#services">Services</a></li>
+              <li><a href="/#services">Services</a></li>
-              <li><a href="#technologies">Technologies</a></li>
+              <li><a href="/#technologies">Technologies</a></li>
-              <li><a href="#contact" class="button">Get In Touch</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>

app/themes/coop-tech-oowp-theme/public/css/app.css

@@ -4180,7 +4180,8 @@ a {
   text-decoration: none;
   line-height: inherit;
   cursor: pointer;
-  word-break: break-all; }
+
+}
   a:hover, a:focus {
     color: #1585cf; }
   a img {
@@ -6347,7 +6348,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; }
@@ -6706,6 +6709,12 @@ h5#join-us {
 .home #clients {
   background-color: #f7f7f5; }
 
+
+
+.client:nth-child(n+7){
+    display: none;
+}
+
 .client-thumb {
   height: 150px;
   width: 100%;
@@ -6829,6 +6838,9 @@ h5#join-us {
   padding-left: 2rem;
   color: #9196a2; }
 
+.close{
+  float: right;
+}
 #page-banner {
   margin-bottom: 4rem;
   text-align: center; }

app/themes/coop-tech-oowp-theme/public/js/app.js

@@ -51,3 +51,8 @@ app.createMapMultiMarker = function(mapId, lat, lng, zoom, markersArray) {
 };
 
 //# sourceMappingURL=app.js.map
+$('#client-list .column').shuffle();
+window.setInterval(function(){
+    /// call your function here
+    $('#client-list .column').shuffle();
+}, 7000);

index.html

@@ -102,11 +102,11 @@ layout: home
     <div class="small-12 columns">
       <h2>Clients</h2>
       <p>Here are some of the amazing clients we have worked with so far</p>
-      <div class="row small-up-2 medium-up-3 large-up-6">
+      <div id='client-list' class="row small-up-2 medium-up-3 large-up-6">
-        {% assign clients = site.clients | sample:6 %}
+        {% assign clients = site.clients %}
         {% for client in clients %}
-          <div class="column">
+          <div class="column client">
-            <div class="client-thumb" style="background-image: url(/images/clients/{{ client.slug }})"></div>
+            <div class="client-thumb" style='background-image: url(/images/clients/{{ client.slug }}') title="{{client.slug}}"></div>
           </div>
         {% endfor %}
       </div>