Name CAAT as the client

Update email address

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!22

.gitlab-ci.yml

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

CHANGELOG.md

@@ -0,0 +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

CONTRIBUTING.md

@@ -0,0 +1,65 @@
+# Contributing
+
+### Not that these instructions may be out of date. If you find any quirks that aren't described in this file, please make patches.
+
+# What Is Jekyll
+
+For those unfamiliar with how Jekyll works, check out [jekyll.rb] for all the
+details, or read up on the basics of [front matter], [writing posts] and
+[creating pages].
+
+[jekyll.rb]: https://jekyllrb.com/
+[front matter]: https://jekyllrb.com/docs/frontmatter/
+[writing posts]: https://jekyllrb.com/docs/posts/
+[creating pages]: https://jekyllrb.com/docs/pages/
+
+# Using RVM to Manage Ruby
+
+In order to not blow up your computer handling a system wide Ruby installation, it is
+advised that you use [RVM](https://rvm.io/rvm/install).
+
+Once you've got that installed and configured, get the latest version of Ruby with:
+
+```bash
+$ rvm install 2.4.2
+```
+
+Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with:
+
+```bash
+$ rvm use 2.4.2
+$ rvm gemset create autonomic
+$ rvm gemset use autonomic
+```
+
+# Install Dependencies
+
+Then you can get your Ruby dependencies installed with:
+
+``` bash
+$ gem install jekyll bundler
+$ bundle install
+```
+
+# Serve Website
+
+And serve the website locally with:
+
+``` bash
+$ make devserver
+```
+
+# Editing Content
+
+You can edit content in the `.md` files under `src` and `src/_posts`.
+
+# Manage Gemset
+
+When you're hacking later on (or in a new shell), you'll need to run:
+
+``` bash
+$ rvm use 2.4.2
+$ rvm gemset use autonomic
+```
+
+And then you'll have access to the environment.

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
-ruby '2.4.2'
+ruby '2.4.7'
 gemspec

LICENSE

@@ -0,0 +1,259 @@
+Creative Commons Attribution 3.0 Unported
+http://creativecommons.org/licenses/by/3.0/
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
+BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
+CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
+IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other
+   pre-existing works, such as a translation, adaptation, derivative work,
+   arrangement of music or other alterations of a literary or artistic work, or
+   phonogram or performance and includes cinematographic adaptations or any
+   other form in which the Work may be recast, transformed, or adapted
+   including in any form recognizably derived from the original, except that a
+   work that constitutes a Collection will not be considered an Adaptation for
+   the purpose of this License. For the avoidance of doubt, where the Work is a
+   musical work, performance or phonogram, the synchronization of the Work in
+   timed-relation with a moving image ("synching") will be considered an
+   Adaptation for the purpose of this License.  2. "Collection" means a
+   collection of literary or artistic works, such as encyclopedias and
+   anthologies, or performances, phonograms or broadcasts, or other works or
+   subject matter other than works listed in Section 1(f) below, which, by
+   reason of the selection and arrangement of their contents, constitute
+   intellectual creations, in which the Work is included in its entirety in
+   unmodified form along with one or more other contributions, each
+   constituting separate and independent works in themselves, which together
+   are assembled into a collective whole. A work that constitutes a Collection
+   will not be considered an Adaptation (as defined above) for the purposes of
+   this License.  3. "Distribute" means to make available to the public the
+   original and copies of the Work or Adaptation, as appropriate, through sale
+   or other transfer of ownership.  4. "Licensor" means the individual,
+   individuals, entity or entities that offer(s) the Work under the terms of
+   this License.  5. "Original Author" means, in the case of a literary or
+   artistic work, the individual, individuals, entity or entities who created
+   the Work or if no individual or entity can be identified, the publisher; and
+   in addition (i) in the case of a performance the actors, singers, musicians,
+   dancers, and other persons who act, sing, deliver, declaim, play in,
+   interpret or otherwise perform literary or artistic works or expressions of
+   folklore; (ii) in the case of a phonogram the producer being the person or
+   legal entity who first fixes the sounds of a performance or other sounds;
+   and, (iii) in the case of broadcasts, the organization that transmits the
+   broadcast.  6. "Work" means the literary and/or artistic work offered under
+   the terms of this License including without limitation any production in the
+   literary, scientific and artistic domain, whatever may be the mode or form
+   of its expression including digital form, such as a book, pamphlet and other
+   writing; a lecture, address, sermon or other work of the same nature; a
+   dramatic or dramatico-musical work; a choreographic work or entertainment in
+   dumb show; a musical composition with or without words; a cinematographic
+   work to which are assimilated works expressed by a process analogous to
+   cinematography; a work of drawing, painting, architecture, sculpture,
+   engraving or lithography; a photographic work to which are assimilated works
+   expressed by a process analogous to photography; a work of applied art; an
+   illustration, map, plan, sketch or three-dimensional work relative to
+   geography, topography, architecture or science; a performance; a broadcast;
+   a phonogram; a compilation of data to the extent it is protected as a
+   copyrightable work; or a work performed by a variety or circus performer to
+   the extent it is not otherwise considered a literary or artistic work.  7.
+   "You" means an individual or entity exercising rights under this License who
+   has not previously violated the terms of this License with respect to the
+   Work, or who has received express permission from the Licensor to exercise
+   rights under this License despite a previous violation.  8. "Publicly
+   Perform" means to perform public recitations of the Work and to communicate
+   to the public those public recitations, by any means or process, including
+   by wire or wireless means or public digital performances; to make available
+   to the public Works in such a way that members of the public may access
+   these Works from a place and at a place individually chosen by them; to
+   perform the Work to the public by any means or process and the communication
+   to the public of the performances of the Work, including by public digital
+   performance; to broadcast and rebroadcast the Work by any means including
+   signs, sounds or images.  9. "Reproduce" means to make copies of the Work by
+   any means including without limitation by sound or visual recordings and the
+   right of fixation and reproducing fixations of the Work, including storage
+   of a protected performance or phonogram in digital form or other electronic
+   medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
+or restrict any uses free from copyright or rights arising from limitations or
+exceptions that are provided for in connection with the copyright protection
+under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor
+hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the
+duration of the applicable copyright) license to exercise the rights in the
+Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more
+   Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation,
+   including any translation in any medium, takes reasonable steps to clearly
+   label, demarcate or otherwise identify that changes were made to the
+   original Work. For example, a translation could be marked "The original work
+   was translated from English to Spanish," or a modification could indicate
+   "The original work has been modified."; 3. to Distribute and Publicly
+   Perform the Work including as incorporated in Collections; and, 4. to
+   Distribute and Publicly Perform Adaptations.  5.
+
+      For the avoidance of doubt: 1. Non-waivable Compulsory License Schemes.
+      In those jurisdictions in which the right to collect royalties through
+      any statutory or compulsory licensing scheme cannot be waived, the
+      Licensor reserves the exclusive right to collect such royalties for any
+      exercise by You of the rights granted under this License; 2. Waivable
+      Compulsory License Schemes. In those jurisdictions in which the right to
+      collect royalties through any statutory or compulsory licensing scheme
+      can be waived, the Licensor waives the exclusive right to collect such
+      royalties for any exercise by You of the rights granted under this
+      License; and, 3. Voluntary License Schemes. The Licensor waives the right
+      to collect royalties, whether individually or, in the event that the
+      Licensor is a member of a collecting society that administers voluntary
+      licensing schemes, via that society, from any exercise by You of the
+      rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or
+hereafter devised. The above rights include the right to make such
+modifications as are technically necessary to exercise the rights in other
+media and formats. Subject to Section 8(f), all rights not expressly granted by
+Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of
+   this License. You must include a copy of, or the Uniform Resource Identifier
+   (URI) for, this License with every copy of the Work You Distribute or
+   Publicly Perform. You may not offer or impose any terms on the Work that
+   restrict the terms of this License or the ability of the recipient of the
+   Work to exercise the rights granted to that recipient under the terms of the
+   License. You may not sublicense the Work. You must keep intact all notices
+   that refer to this License and to the disclaimer of warranties with every
+   copy of the Work You Distribute or Publicly Perform. When You Distribute or
+   Publicly Perform the Work, You may not impose any effective technological
+   measures on the Work that restrict the ability of a recipient of the Work
+   from You to exercise the rights granted to that recipient under the terms of
+   the License. This Section 4(a) applies to the Work as incorporated in a
+   Collection, but this does not require the Collection apart from the Work
+   itself to be made subject to the terms of this License. If You create a
+   Collection, upon notice from any Licensor You must, to the extent
+   practicable, remove from the Collection any credit as required by Section
+   4(b), as requested. If You create an Adaptation, upon notice from any
+   Licensor You must, to the extent practicable, remove from the Adaptation any
+   credit as required by Section 4(b), as requested.  2. If You Distribute, or
+   Publicly Perform the Work or any Adaptations or Collections, You must,
+   unless a request has been made pursuant to Section 4(a), keep intact all
+   copyright notices for the Work and provide, reasonable to the medium or
+   means You are utilizing: (i) the name of the Original Author (or pseudonym,
+   if applicable) if supplied, and/or if the Original Author and/or Licensor
+   designate another party or parties (e.g., a sponsor institute, publishing
+   entity, journal) for attribution ("Attribution Parties") in Licensor's
+   copyright notice, terms of service or by other reasonable means, the name of
+   such party or parties; (ii) the title of the Work if supplied; (iii) to the
+   extent reasonably practicable, the URI, if any, that Licensor specifies to
+   be associated with the Work, unless such URI does not refer to the copyright
+   notice or licensing information for the Work; and (iv) , consistent with
+   Section 3(b), in the case of an Adaptation, a credit identifying the use of
+   the Work in the Adaptation (e.g., "French translation of the Work by
+   Original Author," or "Screenplay based on original Work by Original
+   Author"). The credit required by this Section 4 (b) may be implemented in
+   any reasonable manner; provided, however, that in the case of a Adaptation
+   or Collection, at a minimum such credit will appear, if a credit for all
+   contributing authors of the Adaptation or Collection appears, then as part
+   of these credits and in a manner at least as prominent as the credits for
+   the other contributing authors. For the avoidance of doubt, You may only use
+   the credit required by this Section for the purpose of attribution in the
+   manner set out above and, by exercising Your rights under this License, You
+   may not implicitly or explicitly assert or imply any connection with,
+   sponsorship or endorsement by the Original Author, Licensor and/or
+   Attribution Parties, as appropriate, of You or Your use of the Work, without
+   the separate, express prior written permission of the Original Author,
+   Licensor and/or Attribution Parties.  3. Except as otherwise agreed in
+   writing by the Licensor or as may be otherwise permitted by applicable law,
+   if You Reproduce, Distribute or Publicly Perform the Work either by itself
+   or as part of any Adaptations or Collections, You must not distort,
+   mutilate, modify or take other derogatory action in relation to the Work
+   which would be prejudicial to the Original Author's honor or reputation.
+   Licensor agrees that in those jurisdictions (e.g. Japan), in which any
+   exercise of the right granted in Section 3(b) of this License (the right to
+   make Adaptations) would be deemed to be a distortion, mutilation,
+   modification or other derogatory action prejudicial to the Original Author's
+   honor and reputation, the Licensor will waive or not assert, as appropriate,
+   this Section, to the fullest extent permitted by the applicable national
+   law, to enable You to reasonably exercise Your right under Section 3(b) of
+   this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
+ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
+EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN
+NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
+INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
+LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate
+   automatically upon any breach by You of the terms of this License.
+   Individuals or entities who have received Adaptations or Collections from
+   You under this License, however, will not have their licenses terminated
+   provided such individuals or entities remain in full compliance with those
+   licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this
+   License.  2. Subject to the above terms and conditions, the license granted
+   here is perpetual (for the duration of the applicable copyright in the
+   Work). Notwithstanding the above, Licensor reserves the right to release the
+   Work under different license terms or to stop distributing the Work at any
+   time; provided, however that any such election will not serve to withdraw
+   this License (or any other license that has been, or is required to be,
+   granted under the terms of this License), and this License will continue in
+   full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection,
+   the Licensor offers to the recipient a license to the Work on the same terms
+   and conditions as the license granted to You under this License.  2. Each
+   time You Distribute or Publicly Perform an Adaptation, Licensor offers to
+   the recipient a license to the original Work on the same terms and
+   conditions as the license granted to You under this License.  3. If any
+   provision of this License is invalid or unenforceable under applicable law,
+   it shall not affect the validity or enforceability of the remainder of the
+   terms of this License, and without further action by the parties to this
+   agreement, such provision shall be reformed to the minimum extent necessary
+   to make such provision valid and enforceable.  4. No term or provision of
+   this License shall be deemed waived and no breach consented to unless such
+   waiver or consent shall be in writing and signed by the party to be charged
+   with such waiver or consent.  5. This License constitutes the entire
+   agreement between the parties with respect to the Work licensed here. There
+   are no understandings, agreements or representations with respect to the
+   Work not specified here. Licensor shall not be bound by any additional
+   provisions that may appear in any communication from You. This License may
+   not be modified without the mutual written agreement of the Licensor and
+   You.  6. The rights granted under, and the subject matter referenced, in
+   this License were drafted utilizing the terminology of the Berne Convention
+   for the Protection of Literary and Artistic Works (as amended on September
+   28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996,
+   the WIPO Performances and Phonograms Treaty of 1996 and the Universal
+   Copyright Convention (as revised on July 24, 1971). These rights and subject
+   matter take effect in the relevant jurisdiction in which the License terms
+   are sought to be enforced according to the corresponding provisions of the
+   implementation of those treaty provisions in the applicable national law. If
+   the standard suite of rights granted under applicable copyright law includes
+   additional rights not granted under this License, such additional rights are
+   deemed to be included in the License; this License is not intended to
+   restrict the license of any rights under applicable law.

Makefile

@@ -0,0 +1,6 @@
+DEV_DIST_DIR:=dist
+
+devserver:
+	@echo "Serving development site from $(DEV_DIST_DIR)"
+	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
+.PHONY: devserver

README.md

@@ -2,60 +2,28 @@
 
 # autonomic-cooperative.gitlab.io
 
-A [Jekyll] based site for the Autonomic Cooperative.
+A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template.
 
-The template is based on the [spectral-jekyll-theme].
+We use [autonomic.zone] for production. We used to use [autonomic-cooperative.gitlab.io] as staging but this isn't really needed anymore.
 
 [Jekyll]: https://jekyllrb.com/
 [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme
+[autonomic.zone]: https://autonomic.zone/
+[autonomic-cooperative.gitlab.io]: http://autonomic-cooperative.gitlab.io/
 
-# Quick Start
+# Make a change
 
-For those unfamiliar with how Jekyll works, check out [jekyll.rb] for all the
+Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [deploy] CI stage will push any changes on master branch to [autonomic.zone].
-details, or read up on the basics of [front matter], [writing posts] and
-[creating pages].
 
-[jekyll.rb]: https://jekyllrb.com/
+[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17
-[front matter]: https://jekyllrb.com/docs/frontmatter/
-[writing posts]: https://jekyllrb.com/docs/posts/
-[creating pages]: https://jekyllrb.com/docs/pages/
 
-In order to not blow up your computer handling a system wide Ruby installation, it is
+Watch the [CI/CD pipeline] to see that it builds successfully.
-advised that you use [RVM](https://rvm.io/rvm/install).
 
-Once you've got that installed and configured, get the latest version of Ruby with:
+[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines
 
-```bash
-$ rvm install 2.4.2
-```
 
-Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with:
+# Contribute
 
-```bash
+Please see [CONTRIBUTING.md] for the juicy details. It may need to be updated so please submit patches if you discover some quirk!
-$ rvm use 2.4.2
-$ rvm gemset create autonomic
-$ rvm gemset use autonomic
-```
 
-Then you can get your Ruby dependencies installed with:
+[CONTRIBUTING.md]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CONTRIBUTING.md
-
-``` bash
-$ gem install jekyll bundler
-```
-
-And serve the website locally with:
-
-``` bash
-$ jekyll serve
-```
-
-You can edit content in the `.md` files under `src` and `src/_posts`.
-
-When you're hacking later on (or in a new shell), you'll need to run:
-
-``` bash
-$ rvm use 2.4.2
-$ rvm gemset use autonomic
-```
-
-And then you'll have access to the environment.

_config.yml

@@ -20,3 +20,7 @@ collections:
     permalink: /blog/:title/
   clients:
     output: false
+exclude:
+  - vendor
+  - Gemfile
+  - Gemfile.lock

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:helo@autonomic.zone">helo@autonomic.zone</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

@@ -30,7 +30,7 @@
         <h3>Cloud Storage and Collaboration</h3>
         <p>
           <a href="https://sandstorm.io/">Sandstorm</a> is a personal "cloud
-          in a box" , designed with the upmost security in mind. It allows you to
+          in a box" , designed with the utmost security in mind. It allows you to
           deploy apps for file-storage, collaborative document editing,
           calendars, to-do lists and much more.
         </p>
@@ -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 tailored 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,55 +1,84 @@
 ---
 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
 ---
 
-Autonomic is a worker co-operative. That means we are owned and run by our workers and not by bosses or investors. We make our
+Autonomic is a worker co-operative. That means we are owned and run by our
-decisions collectively using consensus. We are committed to a set of basic principles of working on projects for social
+workers and not by bosses or investors. We make our decisions collectively
-good. We reject destructive and unsustainable practices within the tech industry.
+using consensus. We are committed to a set of basic principles of working on
+projects for social good. We reject destructive and unsustainable practices
+within the tech industry.
 
-As individuals, we have become increasingly concerned with the levels of surveillance carried by nation states and corporations.
+As individuals, we have become increasingly concerned with the levels of
-Everyone deserves the fundamental right to privacy and safety online as well as in the physical world. We seem to be moving ever
+surveillance carried by nation states and corporations.  Everyone deserves the
-closer to a total reliance upon centralised services that mine our data for profit and are run in anything but our best interest as
+fundamental right to privacy and safety online as well as in the physical
-users.
+world. We seem to be moving ever closer to a total reliance upon centralised
+services that mine our data for profit and are run in anything but our best
+interest as users.
 
-There is another way. The philosophy of [free software](https://fsfe.org/about/basics/freesoftware.en.html) allows for development guided not by profit alone, but instead by the desires and inspiration of the developers and users. Rather than subjugating users, it aims to empower users by making software source code available for anyone to examine, modify or share. We are committed to building the software commons by making as much of our code available under free software licences as possible.
+There is another way. The philosophy of [free software] allows for development
+guided not by profit alone, but instead by the desires and inspiration of the
+developers and users. Rather than subjugating users, it aims to empower users
+by making software source code available for anyone to examine, modify or
+share. We are committed to building the software commons by making as much of
+our code available under free software licences as possible.
 
-As the internet becomes ubiquitous in our everyday lives, we must consider the technologies that we utilise in order to communicate. We must all have the ability to discuss and collaborate without being spied upon or our personal information sold to the highest bidder. Autonomic are committed to providing a platform for progressive projects and ideas that require accessible and modern infrastructure to thrive and grow, whilst preserving our client's privacy and protecting their data.
+[free software]: https://fsfe.org/about/basics/freesoftware.en.html
+
+As the internet becomes ubiquitous in our everyday lives, we must consider the
+technologies that we utilise in order to communicate. We must all have the
+ability to discuss and collaborate without being spied upon or our personal
+information sold to the highest bidder. Autonomic are committed to providing a
+platform for progressive projects and ideas that require accessible and modern
+infrastructure to thrive and grow, whilst preserving our client's privacy and
+protecting their data.
 
 ## Privacy
 
-We seek to minimise data collection and retention wherever possible. If you don't need it, don't collect it.
+We seek to minimise data collection and retention wherever possible. If you
+don't need it, don't collect it.
 
-We will utilise and recommend encryption wherever possible, especially if it is end to end encryption and has been well tested in
+We will utilise and recommend encryption wherever possible, especially if it is
-real life scenarios by non-technical users.
+end to end encryption and has been well tested in real life scenarios by
+non-technical users.
 
-We believe that unrestricted and uncensored access to the internet is a human right and we should all resist any attempts to censor
+We believe that unrestricted and uncensored access to the internet is a human
-the sharing of knowledge and experiences that helps build greater cooperation between peoples around the world.
+right and we should all resist any attempts to censor the sharing of knowledge
+and experiences that helps build greater cooperation between peoples around the
+world.
 
 ## Transparency
-We don't give you any crap. If something goes wrong, we'll let you know and seek to communicate with our clients and the public in
-an effective manner.
 
-We are committed to using free (as in freedom) software wherever possible and seek to contribute back to the upstream projects we rely on where practical.
+We don't give you any crap. If something goes wrong, we'll let you know and
+seek to communicate with our clients and the public in an effective manner.
 
-We engage in ethical processes to avoid working with any organisations that are racist, homophobic, transphobic, misogynist or otherwise engage in oppressive behaviour.
+We are committed to using free (as in freedom) software wherever possible and
+seek to contribute back to the upstream projects we rely on where practical.
+
+We engage in ethical processes to avoid working with any organisations that are
+racist, homophobic, transphobic, misogynist or otherwise engage in oppressive
+behaviour.
 
 ## Sustainability
-As a worker co-operative, we aim to grow in a sustainable way. This means not taking venture capital or risky loans. We build this the
-smart way, through hard work. We are always learning and studying as we go.
 
-We are committed to learning more about about the ecological impact of technology. Whether that be the energy used by data centres
+As a worker co-operative, we aim to grow in a sustainable way. This means not
-or the components in our computing devices.
+taking venture capital or risky loans. We build this the smart way, through
+hard work. We are always learning and studying as we go.
 
-We will engage with the wider co-operative movement and work together to grow our sector and begin to build a new world in the ashes
+We are committed to learning more about about the ecological impact of
-of the old.
+technology. Whether that be the energy used by data centres or the components
+in our computing devices.
+
+We will engage with the wider co-operative movement and work together to grow
+our sector and begin to build a new world in the ashes of the old.
 
 <hr>
 
-We hope this basic statement of principles has given you an idea of where we are coming from and perhaps where we will be heading. The plan
+We hope this basic statement of principles has given you an idea of where we
-is to revisit these ideas as we grow and access the impact of this project. We hope you will be a part of this adventure.
+are coming from and perhaps where we will be heading. The plan is to revisit
-
+these ideas as we grow and access the impact of this project. We hope you will
+be a part of this adventure.

src/_posts/2019-08-30-civicrm-mailing-validation.md

@@ -0,0 +1,129 @@
+---
+layout: post
+title: CiviCRM AngularJS extension
+description: Adding custom validation to the CiviCRM Mailing form
+image: civicrm_validation_header.jpg
+category: howto
+date: 2019-08-30
+---
+
+We support [Campaign Against Arms Trade](https://caat.org.uk), a right-on group
+that works to end the international arms trade, with their technology –
+including CiviCRM](https://civicrm.org/), a popular open source
+"constituent relationship management" platform. 
+
+Among other things, CAAT uses CiviCRM's "Mailing" features to send out emails to
+their supporters, and they told us that they're experiencing an annoying bug: if
+a user sends out a mailing with the same name (not subject line, just the
+internal identifier 🙄) as an existing one, it'll cause the CRM to freeze up
+elsewhere.
+
+As an added challenge, the mailing features of CiviCRM [now use
+AngularJS](https://docs.civicrm.org/dev/en/latest/framework/angular/) following
+a recent rebuild by the developers, and there aren't many tutorials or examples
+out there to customise it. Luckily, the CiviCRM developer community was
+super-helpful, and we managed to sort out some in-form validation to prevent
+duplicate mailing names for our client… and now for you, too!
+
+## Create a new extension
+
+Using [`civix`](https://github.com/totten/civix), we set up a new CiviCRM extension for our code:
+
+    civix generate:module mailing
+
+(We called our extension `mailing`, because our creative director was occupied
+with an Art at the time)
+
+Our client sensibly keeps their custom CiviCRM extensions in `git`, so at this
+stage we initialised a repository, added the boilerplate template code, and
+pushed.
+
+## Set up the AngularJS hook
+
+A function called `mailing_civicrm_alterAngular()`  will get executed whenever
+an AngularJS page loads, and you can use a `ChangeSet` to edit an AngularJS
+template. Because AngularJS templates specify form logic, this also lets you
+change the validation behaviour. Our hook function looks like this:
+
+    function mailing_civicrm_alterAngular($angular) {
+      $changeSet = \Civi\Angular\ChangeSet::create('mailing_name_unique')
+        ->alterHtml('~/crmMailing/BlockSummary.html', function(phpQueryObject $doc) {
+          // name validation
+          $doc->find('.crm-group:has([crm-ui-id="subform.mailingName"])')->attr('ng-controller', 'NameValidateCtrl');
+          $doc->find('[crm-ui-id="subform.mailingName"]')->attr('ng-blur', 'validateName(mailing, \'name\')');
+          $doc->find('[crm-ui-id="subform.mailingName"]')->attr('crm-ui-validate', 'isValid');
+        });
+
+      $angular->add($changeSet);
+
+      CRM_Core_Resources::singleton()->addScriptFile('mailing', 'js/disallow-duplicate-names.js');
+    }
+
+
+Setting `crm-ui-validate` to `validateName` directly fired the event _way_ too
+many times, so instead `validateName` is only called when focus leaves the
+field, `ng-blur`, which then sets the `isValid` variable that's checked by
+`crm-ui-validate`.
+
+## Create the `validateName` function
+
+Then, the code which queries the CiviCRM API to check for mailings with
+duplicate names:
+
+    var validating = false;
+    
+    (function(angular, $) {
+      var crmMailing = angular.module('crmMailing');
+    
+      crmMailing.controller('NameValidateCtrl', function($scope) {
+          $scope.isValid = false;
+    
+          $scope.validateName = function(mailing, field) {
+            if (!validating) {
+              validating = true;
+    
+              CRM.api3('Mailing', 'get', {
+                "sequential": 1,
+                "name": mailing[field],
+                "id": {"!=": mailing.id}
+              }).then(function(result) {
+                // do something with result
+                if (result.count > 0 ) {
+                  $scope.isValid = false;
+                  CRM.alert(ts('There is already a mailing with this name; sending this one will crash CiviCRM!'));
+                } else {
+                  $scope.isValid = true;
+                }
+              }, function(error) {
+                // oops
+                console.log(error);
+              });
+    
+              validating = false;
+          }
+        };
+      });
+    })(angular, CRM.$);
+
+(saved as `js/disallow-duplicate-names.js`)
+
+## Conclusion
+
+Activate the extension, e.g. with `cv`
+
+     $ cv en mailing
+
+Now, open a mailing and try to give it the same name as an existing one – you
+should see the field border turn red, and you'll be prevented from continuing or
+sending the mailing:
+
+!["Mailing name" field showing the field with a red border and red label](/assets/images/2019-08-30_civicrm_validation.png)
+
+(As a bonus, the extension also sends a notification to the user using
+`CRM.alert` to explain the error)
+
+It does seem like a red border sometimes hangs around the field label even after
+the value is valid again… but apart from that, the feature is working great!
+
+Lastly, props to CAAT for being a great member of the CiviCRM community and
+supporting us writing this post to share our work with y'all.

src/assets/pgp/autonomic-key.asc

@@ -11,54 +11,183 @@ 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
-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
+tDJBdXRvbm9taWMgQ28tb3BlcmF0aXZlIDxhdXRvbm9taWMtY29vcEBwb3N0ZW8u
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
++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
-teRDUcFa5cYgqFwaXFmD8OxtkLBSLyfRzpDT5tHQFGMvAkvy21G6j6R82bCvIdPZ
+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
-ZlRzmIkF3pEpoClcuSM4qh5MYmF0FO5zcxOo0+4KUOry1BIVmY7Pe+xk8D2IP3lT
+TsEkfbWVnWhO3Kp+Ii/gofNOO7TdhyWCdsD78tVS3c3fZtIoYkhzy3CHbVZYeZ+J
-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
+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
-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
+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
-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
+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
-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
+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
-LD3qhdNlZCTXaT2y9VIPc+acE21C1WyCLtp6F/SDlLlR5F2oDSEX81jLupzBHXsH
+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
-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
+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
-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
+DG1QcBsrF6WxxNxiPhJOiZ9gw/WA2JWz2Q7GrXjy7QS7+3iR5qtSIEt5BAj1kHIa
-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
+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
-LqnnUvZcN7CeEcJCba0Gg03zl17bjHQIVbCfjqVGtxeSHyRdbJ6ilrdBRq0AdoCZ
+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
-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
+IO+EGhTtR0EooVY63Y59KZVr9jwEikKMpGbfvSCHiXysKAzkV+PGQ5Z178y7U8dK
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+Nz0F6p6wD+XoNUqJv/xogwWj8McnNg5594ksIfFfkJixoAOQTEzN722+90nVguN6
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-yoD+qwqMFyqlaOMoo/8GBrDUYJAP2l+/3/BF8d6HaO5KckAxxC1NClW6uvXPfEIr
+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
-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
++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
-4Z8IIlRRs6PNRbtyCi5kPzqIz2wzKMW5CYdtMIEMMkwNtbJTQsHKL0lRolTIi5PH
+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
-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
+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
-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
+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
-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
+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
-fG9YVaQqGxeUSQ==
+Bn8NXcfI/kLvYknvuTvhlIRG22eCOD89Y4QEoK0L51FSHdpHKs20gEdftpZWG513
-=OH/1
+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
+AhF2loFrCEnlZw==
+=u0eg
 -----END PGP PUBLIC KEY BLOCK-----

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

@@ -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:       #e2e2e2,
+      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;