Inital refresh of colour scheme

This reverts commit 8293415fbd.

.gitlab-ci.yml

@@ -1,29 +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:
     - master
-    - tags

CHANGELOG.md

@@ -1,9 +1,24 @@
 # Change Log
+
 All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].
 
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: http://semver.org/spec/v2.0.0.html
 
+## [1.0.2] - 2017-11-05
+
+## Added
+- [#18]: Add shared account email.
+
+[#18]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/18
+
+## [1.0.1] - 2017-10-14
+
+## Added
+- [#17]: Added automated Gitlab CI production builds.
+
+[#17]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/17
+
 ## [1.0.0] - 2017-10-04
 - Initial Release

Makefile

@@ -1,18 +1,6 @@
 DEV_DIST_DIR:=dist
-PROD_DIST_DIR:=proddist
-PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git
-PROD_BRANCH:=production
 
 devserver:
 	@echo "Serving development site from $(DEV_DIST_DIR)"
 	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
 .PHONY: devserver
-
-release:
-	@echo "Building production site into $(PROD_DIST_DIR)"
-	@jekyll build --destination $(PROD_DIST_DIR)
-	@echo "Resetting existing production branch"
-	@git push $(PROD_REMOTE) $(PROD_BRANCH) --delete
-	@echo "Pushing latest $(PROD_DIST_DIR) contents to the upstream production branch"
-	@git subtree push --prefix $(PROD_DIST_DIR) $(PROD_REMOTE) $(PROD_BRANCH)
-.PHONY: release

README.md

@@ -21,15 +21,39 @@ Please see [CONTRIBUTING.md] for the juicy details.
 
 # Make A New Release
 
-Firstly, you'll need to tag and push the latest HEAD with:
+Please add a new [change log] entry. This helps us track released changes easily.
+
+[change log]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CHANGELOG.md
+
+Then, [tag a new commit] and send it upstream with:
+
+[tag a new commit]: https://git-scm.com/book/en/v2/Git-Basics-Tagging
+[semantic versioning]: http://semver.org/
 
 ```bash
-$ git tag -a <YOUR-VERSION-NUMBER> $(git rev-parse HEAD)
+$ COMMIT=$(git rev-parse HEAD)
+$ TAG=6.6.6  # enter your new tag
+$ git tag -a $TAG $COMMIT
 $ git push upstream master --tags
 ```
 
-Then make a release with:
+You can also use the [Gitlab tags UI] for this.
+
+[Gitlab tags UI]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tags
+
+Our [deploy] CI stage will push the new site to [the production branch].
+
+[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17
+[the production branch]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tree/production
+
+Watch the [CI/CD pipeline] to see that it builds successfully.
+
+[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines
+
+Then head over to [fullyautomatedluxuryinfrastructure] and run:
+
+[fullyautomatedluxuryinfrastructure]: https://gitlab.com/autonomic-cooperative/fullyautomatedluxuryinfrastructure
 
 ``` bash
-$ make release
+$ ansible-playbook orgs/autonomic/gitlabpages.yml
 ```

bin/deploy

@@ -1,27 +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)"
-./deploy.sh -m "Hello, World!"
-
-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/contact.html

@@ -3,7 +3,7 @@
   <header class="major">
     <h2>Get in Touch</h2>
     <p>Contact us to discuss your project's needs and arrange a consultation.</p>
-    <p><a href="mailto:autonomic@posteo.net">autonomic@posteo.net</a></p>
+    <p><a href="mailto:autonomic-coop@posteo.net">autonomic-coop@posteo.net</a></p>
     <p>
       If you use encrypted email, here is our <a href="{{ "/assets/pgp/autonomic-key.asc" | relative_url }}">PGP key</a>.
       Our key fingerprint is: <br/><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>

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/_includes/services.html

@@ -71,7 +71,7 @@
         <p>
           A grounded and principled understanding of the cybersecurity domain can ensure
           your organisation is not liable to any unwanted security threats. We provide
-          structured training.
+          structured training taliored to your threat model.
         </p>
       </li>
     </ul>

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

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

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;