☺

.gitlab-ci.yml

@@ -1,21 +1,28 @@
 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
-    - ssh-add <(echo "$SSH_PRIVATE_KEY")
-    - rsync -rvz --delete -e 'ssh -o StrictHostKeyChecking=no' ./public/ "$SERVER_USER"@autonomic.zone:/var/www/autonomic.zone/html/
+    - ./bin/deploy
   artifacts:
     paths:
       - public
   only:
-    - master
+    - tags

bin/deploy

@@ -0,0 +1,26 @@
+#!/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,7 +6,6 @@
     <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,13 +14,6 @@
   <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/head.html

@@ -7,4 +7,5 @@
   <link rel="stylesheet" href="{{ "/assets/styles/main.css" | relative_url }}" />
   <!--[if lte IE 8]><link rel="stylesheet" href="{{ "/assets/css/ie8.css" | relative_url }}" /><![endif]-->
   <!--[if lte IE 9]><link rel="stylesheet" href="{{ "/assets/css/ie9.css" | relative_url }}" /><![endif]-->
+  <!-- hi -->
 </head>

src/_includes/membership-footer.html

@@ -1,5 +0,0 @@
-<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 taliored to your threat model.
+          structured training.
         </p>
       </li>
     </ul>

src/_layouts/default.html

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

src/_layouts/spotlight.html

@@ -7,8 +7,8 @@
 
     <div id="main">
         <header>
-            {% if page.image %}
-            <div
+            {% if page.image %} 
+            <div 
                 class="header-image"
                 style="background-image: url('{% if site.featured-image-source %}{{ page.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ page.image }}{% endif %}');"></div>
             {% endif %}
@@ -35,7 +35,6 @@
                     {{ 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,7 +107,6 @@ h4 {
 h5 {
   font-size: 0.8em;
   line-height: 1.5em;
-  font-style: italic;
 }
 
 .h6,
@@ -233,4 +232,4 @@ header {
       display: none;
     }
   }
-}
+}

src/assets/styles/components/_menu.scss

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

src/assets/styles/components/_wrapper.scss

@@ -11,7 +11,7 @@
       color: _palette($p, fg-bold);
     }
 
-
+    
     .h2, .h3, .h4, .h5, .h6,
     h2, h3, h4, h5, h6 {
       color: _palette($p, fg-bold);
@@ -210,14 +210,6 @@
     padding: 0;
   }
 
-  &.compressed {
-      padding: 0.5em 0 0;
-
-      img {
-          max-width: 150px;
-      }
-  }
-
   &.style1 {
     @include wrapper(accent1);
   }
@@ -237,7 +229,7 @@
   &.style5 {
     @include wrapper(accent2);
   }
-
+  
   &.style6 {
     @include wrapper(accent4);
   }
@@ -249,4 +241,4 @@
   @include breakpoint(small) {
     @include padding(3em, 2em);
   }
-}
+}

src/assets/styles/libs/_vars.scss

@@ -50,7 +50,7 @@
       border2:    rgba(0,0,0,0.25),
       border2-bg:   rgba(255,255,255,0.2)
     ),
-
+    
     accent2: (
       bg:       #ffffff,
       fg-bold:    #2E3842,
@@ -72,9 +72,9 @@
       border2:    rgba(0,0,0,0.25),
       border2-bg:   rgba(255,255,255,0.2)
     ),
-
+    
     accent4: (
-      bg:       #313533,
+      bg:       #25558C,
       fg-bold:    #ffffff,
       fg:       mix(#25558C, #ffffff, 25%),
       fg-light:   mix(#25558C, #ffffff, 40%),
@@ -82,16 +82,5 @@
       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 {
-  padding: 4em 0 3.5em;
+  @include padding(6em, 0);
   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,6 +143,7 @@ body.is-mobile {
   }
 
   .copyright {
+    color: _palette(fg-light);
     font-size: 0.8em;
     letter-spacing: _size(letter-spacing-alt);
     list-style: none;