Inital refresh of colour scheme

This reverts commit 8293415fbd.

.gitlab-ci.yml

@@ -1,28 +1,21 @@
 image: ruby:2.4.2
 
 stages:
-  - build
   - deploy
 
-build:
-  stage: build
-  before_script:
-    - gem install jekyll
-  script:
-    - jekyll build -d public
-  artifacts:
-    paths:
-      - public
-
 deploy:
   stage: deploy
   before_script:
+    - apt-get update -y
+    - apt-get -y install rsync
     - gem install jekyll
+    - eval $(ssh-agent -s)
   script:
     - jekyll build -d public
-    - ./bin/deploy
+    - ssh-add <(echo "$SSH_PRIVATE_KEY")
+    - rsync -rvz --delete -e 'ssh -o StrictHostKeyChecking=no' ./public/ "$SERVER_USER"@autonomic.zone:/var/www/autonomic.zone/html/
   artifacts:
     paths:
       - public
   only:
-    - tags
+    - master

bin/deploy

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-GITUSERNAME="autonomicgitlabci"
-GITUSEREMAIL="autonomicgitlabci@nowhere.com"
-DEPLOYSCRIPT="https://github.com/X1011/git-directory-deploy/raw/master/deploy.sh"
-
-export GIT_DEPLOY_DIR="public"
-export GIT_DEPLOY_BRANCH="production"
-export GIT_DEPLOY_REPO="git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git"
-
-apt-get update -y
-apt-get install -yqq wget openssh-client
-
-wget $DEPLOYSCRIPT && chmod +x deploy.sh
-
-git config --global user.email $GITUSEREMAIL
-git config --global user.name  $GITUSERNAME
-
-mkdir -p ~/.ssh
-eval "$(ssh-agent -s)"
-ssh-add <(echo "$SSH_PRIVATE_KEY")
-echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-
-./deploy.sh -m "Git tag: $(git describe --exact-match HEAD)"
-
-rm -Rfv .ssh

src/_includes/blog.html

@@ -6,6 +6,7 @@
     <div class="image">{% if post.image %}<img src="{% if site.featured-image-source %}{{ post.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ post.image }}{% endif %}" alt="" />{% endif %}</div>
     <div class="content">
       <h2><a href="{{ post.url | relative_url }}" class="link">{{ post.title }}</a></h2>
+      <p class="h5">{{ post.date | date: '%B %d, %Y' }}</p>
       <p>{{ post.description }}</p>
     </div>
   </section>

src/_includes/footer.html

@@ -14,6 +14,13 @@
   <ul class="copyright">
     <li class="icon fa-creative-commons">&nbsp;{{ site.title }}</li>
   </ul>
+
+  <address>
+      Autonomic Co-operative</br>
+      1539 Pershore Road </br>
+      Stirchley</br>
+      B30 2JH
+  </address>
 </footer>
 
 </div>

src/_includes/membership-footer.html

@@ -0,0 +1,5 @@
+<section class="wrapper style5 special compressed">
+    <a href="https://www.coops.tech/" target="_blank">
+    <img src="/assets/images/Member-of-CoTech-logo-200.png" alt="Member of Co-Tech"/>
+    </a>
+</section>

src/_layouts/default.html

@@ -9,6 +9,7 @@
   {% include services.html %}
   {% include contact.html %}
   {% include footer.html %}
+  {% include membership-footer.html %}
   {% include foot-scripts.html %}
 </body>
 </html>

src/_layouts/spotlight.html

@@ -35,6 +35,7 @@
                     {{ item.title }}
                     {% if item.layout %}</a>{% endif %}
                     </h2>
+                    <p class="h5">{{ item.date | date: '%B %d, %Y' }}</p>
                     <p>{{ item.description }}</p>
                 </div>
             </section>

src/_posts/2016-09-23-our-founding-principles.md

@@ -2,7 +2,7 @@
 layout: post
 title: Our Founding Principles
 description: Autonomic Co-operative And Our Core Values
-image: thinkpad.jpg
+image: pic01.jpg
 category: values
 date: 2017-10-03
 ---

src/_posts/2018-01-11-spectre-and-meltdown.md

@@ -1,150 +0,0 @@
----
-layout: post
-title: Spectre and Meltdown
-description: A Spectre Is Haunting Our Processors...
-image: spectre.jpg
-category: values
-date: 2018-01-11
----
-
-Autonomic have now completed the process of applying patches to to all
-of our servers in response to the so called Spectre and Meltdown 
-vulnerabilities. Our upstream providers have also confirmed that they have
-patched their infrastructure. We will monitor the situation as it develops.
-
-We are currently super busy with clients so we decided to repost the
-excellent security bulletin from our friends over at [Rise Up](https://riseup.net/) 
-which goes into detail oh how to update various operating systems. All credit
-to them for the rest of this blog post.
-
-## The Facts
-
-As you have probably read, there are three related security problems in
-contemporary CPUs. These vulnerabilities open the potential for a
-nefarious program to steal passwords, secrets, and personal information
-from you computer, even if the program is just Javascript loaded from a
-web site you visit. These vulnerabilities are as serious as they sound,
-and you should take action to upgrade your software. 
-
-* The first flaw, called "Meltdown," affects nearly all Intel CPUs and
-has been fixed with updates to most operating systems. 
-
-* The two other flaws, called "Spectre," apply to nearly all CPUs built
-in the last 20 years, not just Intel, although they are more difficult
-to exploit. There are no permanent fixes for Spectre available at this
-time, although if you update your software you will make these attacks
-much less likely. 
-
-You should take *both* these steps now, for all your devices: 
-
-* Upgrade your web browser (see below). These fixes make the new
-attacks against CPUs more much difficult. 
-
-* Upgrade your operating system. There are updates available for
-Windows, macOS, and GNU/Linux that fix the Meltdown vulnerability for
-Intel CPUs and provide some mitigations for Spectre. Additionally, new
-releases of iOS and Android have mitigations for Spectre.
-
-Better fixes will continue to arrive in the next weeks/months for your
-operating system and software. Please keep your system up to date! 
-
-## Browsers 
-By updating your browser, you can make it significantly harder for an
-attacker to steal secrets off your computer using Javascript loaded from
-a web site you visit. 
-
-Firefox version 57.0.4 and later [includes mitigation measures](https://www.mozilla.org/en-US/security/advisories/mfsa2018-01/) 
-against Spectre attack. 
-
-Edge has been updated to include Spectre migitations. When you apply the
-latest Windows update, you will get the new version of Edge. 
-
-Safari will be updated very soon, according to Apple. Check the App
-Store updates. 
-
-Chrome will include Spectre mitigations starting with version 64, to be
-released Jan 23. In the mean time, you can change your configuration to
-greatly mitigate [against the Spectre vulnerability by enabling](https://support.google.com/chrome/answer/7623121?hl=en)
- "site isolation."
-
-Additionally, please see [Rise Up's better browsing guide](https://riseup.net/en/better-web-browsing) for
-instructions on best practices for securing your web experience (which
-will also help mitigate against these new attacks). 
-
-## Windows 
-For Windows 10, you must first upgrade any anti-virus software before
-upgrading Windows. [Failure to do so may make your computer stop working](http://www.theregister.co.uk/2018/01/04/microsoft_windows_patch_meltdown/).
-
-To upgrade Windows 10: 
-
-```
-Select the Start button, and then go to Settings > Update & security > Windows Update, and select Check for updates. 
-```
-
-Now is a good time to enable automatic updates: 
-
-```
-Select the "Start" button, then select "Settings" > "Update & security" > "Windows Update" > "Advanced options" 
-and then under "Choose how updates are installed", select "Automatic (recommended)". 
-```
-
-If you are running Windows 7 or 8, an update is also available. 
-
-## macOS 
-If you already have macOS version 10.13.2 then you are [protected against Meltdown](https://support.apple.com/en-us/HT208394). 
-Otherwise, to upgrade macOS: 
-
-```
-Open the App Store app on your Mac. Click "Updates" in the App Store toolbar, then use the "Update" buttons 
-to download and install any updates listed.
-```
-
-Now is a good time to check enable automatic updates: 
-
-```
-Select the Apple menu, then select "System Preferences" > "App Store" > "Automatically check for updates". 
-```
-
-Apple plans to soon release an update to Safari browser to provide some
-mitigation against Spectre. 
-
-## iOS
-Apple has said that iOS is affected by Spectre, and an update to
-mitigate against most of the new attacks has been released. If you have
-iOS version 11.2 or later, [then you are good](https://support.apple.com/en-us/HT208394). 
-
-To check for new updates, go to `Settings > General > Software Update.` 
-
-## Android 
-The bad news is that Android is vulnerable to Spectre and unless you
-have a Google-branded phone or run a custom firmware you might not get
-an update for months, if ever. However, the consensus among security
-researchers at the moment is that the Spectre attack is difficult enough
-that there are probably easier ways to compromise an Android device.
-Yeah? 
-
-There is one thing you can do now to make your Android device more safe
-against these new CPU attacks: 
-
-* Turn on ["site isolation" in Chrome](https://support.google.com/chrome/answer/7623121?hl=en)
-* Upgrade Chrome Browser after Jan 23. 
-* Alternately, use Firefox for Android. 
-
-## Debian/Ubuntu GNU/Linux 
-Run "Software Center" or "Software Updater." 
-
-Alternately, open a terminal and type: 
-
-```
-sudo apt update 
-sudo apt upgrade 
-sudo reboot 
-```
-
-## Fedora GNU/Linux 
-Open a terminal and type: 
-
-```
-sudo dnf --refresh update kernel 
-sudo reboot 
-```

src/assets/styles/components/_basic.scss

@@ -107,6 +107,7 @@ h4 {
 h5 {
   font-size: 0.8em;
   line-height: 1.5em;
+  font-style: italic;
 }
 
 .h6,

src/assets/styles/components/_menu.scss

@@ -54,7 +54,7 @@
 
       > a {
         border: 0;
-        color: inherit;
+        color: black;
         display: block;
         font-size: 0.8em;
         letter-spacing: _size(letter-spacing-alt);

src/assets/styles/components/_wrapper.scss

@@ -210,6 +210,14 @@
     padding: 0;
   }
 
+  &.compressed {
+      padding: 0.5em 0 0;
+
+      img {
+          max-width: 150px;
+      }
+  }
+
   &.style1 {
     @include wrapper(accent1);
   }

src/assets/styles/libs/_vars.scss

@@ -74,7 +74,7 @@
     ),
 
     accent4: (
-      bg:       #25558C,
+      bg:       #313533,
       fg-bold:    #ffffff,
       fg:       mix(#25558C, #ffffff, 25%),
       fg-light:   mix(#25558C, #ffffff, 40%),
@@ -82,5 +82,16 @@
       border-bg:    rgba(255,255,255,0.075),
       border2:    rgba(0,0,0,0.25),
       border2-bg:   rgba(255,255,255,0.2)
-    )
+    ),
+
+    accent5: (
+      bg:       #41a19d,
+      fg-bold:    #ffffff,
+      fg:       mix(#F3A712, #ffffff, 25%),
+      fg-light:   mix(#F3A712, #ffffff, 40%),
+      border:     rgba(0,0,0,0.125),
+      border-bg:    rgba(255,255,255,0.075),
+      border2:    rgba(0,0,0,0.25),
+      border2-bg:   rgba(255,255,255,0.2)
+    ),
   );

src/assets/styles/main.scss

@@ -126,15 +126,15 @@ body.is-mobile {
 /* Footer */
 
 #footer {
-  @include padding(6em, 0);
+  padding: 4em 0 3.5em;
   background-color: darken(_palette(bg), 8);
   text-align: center;
+  color: rgba(255, 255, 255, 0.7);
 
   .icons {
     font-size: 1.25em;
 
     a {
-      color: _palette(fg-light);
 
       &:hover {
         color: _palette(fg);
@@ -143,7 +143,6 @@ body.is-mobile {
   }
 
   .copyright {
-    color: _palette(fg-light);
     font-size: 0.8em;
     letter-spacing: _size(letter-spacing-alt);
     list-style: none;