From 6c83f37c96c71172d26a763f5483331bab28e76d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 18:59:49 +0200 Subject: [PATCH 01/13] Clean up HTML formatting. --- src/_layouts/default.html | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/_layouts/default.html b/src/_layouts/default.html index e90ca80..30abd0e 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -1,21 +1,14 @@ - {% include head.html %} - -{% include header.html %} -{% include banner.html %} -{% include section-one.html %} -{% include section-two.html %} -{% include section-three.html %} -{% include cta.html %} -{% include footer.html %} -{% include foot-scripts.html %} + {% include header.html %} + {% include banner.html %} + {% include section-one.html %} + {% include section-two.html %} + {% include section-three.html %} + {% include cta.html %} + {% include footer.html %} + {% include foot-scripts.html %} - From 4836fc528e1c64c79cd2863b1433581ec8c33eb6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:35:50 +0200 Subject: [PATCH 02/13] Use better name for contact form HTML. --- src/_includes/{cta.html => contact.html} | 1 - src/_layouts/default.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) rename src/_includes/{cta.html => contact.html} (96%) diff --git a/src/_includes/cta.html b/src/_includes/contact.html similarity index 96% rename from src/_includes/cta.html rename to src/_includes/contact.html index 3955d3a..9f72197 100644 --- a/src/_includes/cta.html +++ b/src/_includes/contact.html @@ -1,4 +1,3 @@ -
diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 30abd0e..ab8b9e3 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -7,7 +7,7 @@ {% include section-one.html %} {% include section-two.html %} {% include section-three.html %} - {% include cta.html %} + {% include contact.html %} {% include footer.html %} {% include foot-scripts.html %} From 3787195d698171132528faea8f26c35a589cb700 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:38:22 +0200 Subject: [PATCH 03/13] Use better name for core values section HTML. --- src/_includes/{section-one.html => core-values.html} | 0 src/_layouts/default.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/_includes/{section-one.html => core-values.html} (100%) diff --git a/src/_includes/section-one.html b/src/_includes/core-values.html similarity index 100% rename from src/_includes/section-one.html rename to src/_includes/core-values.html diff --git a/src/_layouts/default.html b/src/_layouts/default.html index ab8b9e3..e3e7120 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -4,7 +4,7 @@ {% include header.html %} {% include banner.html %} - {% include section-one.html %} + {% include core-values.html %} {% include section-two.html %} {% include section-three.html %} {% include contact.html %} From 34dca0e07d02242c86d287bbb34a8522fc21d9f6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:39:01 +0200 Subject: [PATCH 04/13] Use better name for blog section HTML. --- src/_includes/{section-two.html => blog.html} | 0 src/_layouts/default.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/_includes/{section-two.html => blog.html} (100%) diff --git a/src/_includes/section-two.html b/src/_includes/blog.html similarity index 100% rename from src/_includes/section-two.html rename to src/_includes/blog.html diff --git a/src/_layouts/default.html b/src/_layouts/default.html index e3e7120..1eb7511 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -5,7 +5,7 @@ {% include header.html %} {% include banner.html %} {% include core-values.html %} - {% include section-two.html %} + {% include blog.html %} {% include section-three.html %} {% include contact.html %} {% include footer.html %} From 72ddb3d817888ac13956cbb730a270bc28d1097f Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:39:42 +0200 Subject: [PATCH 05/13] Use better name for services section HTML. --- src/_includes/{section-three.html => services.html} | 0 src/_layouts/default.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/_includes/{section-three.html => services.html} (100%) diff --git a/src/_includes/section-three.html b/src/_includes/services.html similarity index 100% rename from src/_includes/section-three.html rename to src/_includes/services.html diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 1eb7511..c762be3 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -6,7 +6,7 @@ {% include banner.html %} {% include core-values.html %} {% include blog.html %} - {% include section-three.html %} + {% include services.html %} {% include contact.html %} {% include footer.html %} {% include foot-scripts.html %} From 355d0cb639da3ba4c3c5d952b3e23b652366f604 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:42:12 +0200 Subject: [PATCH 06/13] Wrap services text (for ease of future editing). --- src/_includes/services.html | 45 +++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/src/_includes/services.html b/src/_includes/services.html index 7ed747a..19d1280 100644 --- a/src/_includes/services.html +++ b/src/_includes/services.html @@ -3,34 +3,61 @@

Services we offer

-

We design integrated infrastructure tailored to your needs utilising technologies from
the -best free and open source software projects available. Your data under your control.
Here are some examples of the -applications we have deployed for our clients.

+

+ We design integrated infrastructure tailored to your needs utilising + technologies from
the best free and open source software projects + available. Your data under your control.
Here are some examples of + the applications we have deployed for our clients. +

  • Encrypted Email

    -

    Secure your email communications with state of the art transport encryption and TREES encrypted mailbox storage.

    +

    + Secure your email communications with state of the art transport + encryption and TREES + encrypted mailbox storage. +

  • Text and Video Chat

    -

    Mobile friendly multi-channel team chat using Rocket.Chat, with no artificial limits on features. Vital for remote project coordination.

    +

    + Mobile friendly multi-channel team chat using Rocket.Chat, + with no artificial limits on features. Vital for remote project coordination. +

  • Cloud Storage and Collaboration

    -

    Sandstorm is a personal "cloud in a box" , designed with the upmost security in mind. It allows you to deploy apps for file-storage, collaborative document editing, calendars, to-do lists and much more.

    +

    + Sandstorm is a personal "cloud + in a box" , designed with the upmost security in mind. It allows you to + deploy apps for file-storage, collaborative document editing, + calendars, to-do lists and much more. +

  • Voice Conferencing

    -

    Stable and low latency voice communications using Mumble. Perfect for meetings, even with large groups, on mobile, or with low bandwidth.

    +

    + Stable and low latency voice communications using Mumble. + Perfect for meetings, even with large groups, on mobile, or with low bandwidth. +

  • Forum and Mailing Lists

    -

    Build your online community with a modern and responsive forum with Discourse. An accessible replacement for traditional mailing lists.

    +

    + Build your online community with a modern and responsive forum with + Discourse. An accessible + replacement for traditional mailing lists. +

  • Interactive Data and Mapping

    -

    Got some data? We can provide a variety of interactive data visualisations, including mapping using OpenStreetMap, and charts using D3.js. Get the most out of your data by presenting it in a bespoke web app.

    +

    + Got some data? We can provide a variety of interactive data + visualisations, including mapping using OpenStreetMap, + and charts using D3.js. Get the most out of your + data by presenting it in a bespoke web app. +

From ecfa211bfc9548d85163fb0d306d5bfcefbfe9d7 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 19:44:47 +0200 Subject: [PATCH 07/13] Remove unused reference file. --- src/stylesheet.md | 314 ---------------------------------------------- 1 file changed, 314 deletions(-) delete mode 100644 src/stylesheet.md diff --git a/src/stylesheet.md b/src/stylesheet.md deleted file mode 100644 index 4c68532..0000000 --- a/src/stylesheet.md +++ /dev/null @@ -1,314 +0,0 @@ ---- -layout: page -hidden: true -title: Stylesheet -description: Just for reference ---- - -
-

Text

-

This is bold and this is strong. This is italic and this is emphasized. - This is superscript text and this is subscript text. - This is underlined and this is code: for (;;) { ... }. Finally, this is a link.

-
-
-

Heading with a Subtitle

-

Lorem ipsum dolor sit amet nullam id egestas urna aliquam

-
-

Nunc lacinia ante nunc ac lobortis. Interdum adipiscing gravida odio porttitor sem non mi integer non faucibus ornare mi ut ante amet placerat aliquet. Volutpat eu sed ante lacinia sapien lorem accumsan varius montes viverra nibh in adipiscing blandit tempus accumsan.

-
-
Heading with a Subtitle
-

Lorem ipsum dolor sit amet nullam id egestas urna aliquam

-
-

Nunc lacinia ante nunc ac lobortis. Interdum adipiscing gravida odio porttitor sem non mi integer non faucibus ornare mi ut ante amet placerat aliquet. Volutpat eu sed ante lacinia sapien lorem accumsan varius montes viverra nibh in adipiscing blandit tempus accumsan.

-
-

Heading Level 2

-

Heading Level 3

-

Heading Level 4

-
Heading Level 5
-
Heading Level 6
-
-
Blockquote
-
Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis.
-
Preformatted
- 
i = 0;
-
-while (!deck.isInOrder()) {
-print 'Iteration ' + i;
-deck.shuffle();
-i++;
-}
-
-print 'It took ' + i + ' iterations to sort the deck.';
-
- -
-

Lists

-
-
-
Unordered
-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
-
Alternate
-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
-
-
-
Ordered
-
    -
  1. Dolor pulvinar etiam.
    2. -
  2. Etiam vel felis viverra.
    3. -
  3. Felis enim feugiat.
    4. -
  4. Dolor pulvinar etiam.
    5. -
  5. Etiam vel felis lorem.
    6. -
  6. Felis enim et feugiat.
    7. -
-
Icons
- -
-
-
Actions
-
-
- - - - -
-
- - -
-
-
- -
-

Table

-
Default
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
- -
Alternate
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
-
- -
-

Buttons

- - - - - -
    -
  • Disabled
    • -
  • Disabled
    • -
-
- -
-

Form

-
-
-
- -
-
- -
-
-
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
    -
    • -
    • -
-
-
-
-
- -
-

Image

-
Fit
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Left & Right
-

Morbi mattis mi consectetur tortor elementum, varius pellentesque velit convallis. Aenean tincidunt lectus auctor mauris maximus, ac scelerisque ipsum tempor. Duis vulputate ex et ex tincidunt, quis lacinia velit aliquet. Duis non efficitur nisi, id malesuada justo. Maecenas sagittis felis ac sagittis semper. Curabitur purus leo, tempus sed finibus eget, fringilla quis risus. Maecenas et lorem quis sem varius sagittis et a est. Maecenas iaculis iaculis sem. Donec vel dolor at arcu tincidunt bibendum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Fusce ut aliquet justo. Donec id neque ipsum. Integer eget ultricies odio. Nam vel ex a orci fringilla tincidunt. Aliquam eleifend ligula non velit accumsan cursus. Etiam ut gravida sapien. Morbi mattis mi consectetur tortor elementum, varius pellentesque velit convallis. Aenean tincidunt lectus auctor mauris maximus, ac scelerisque ipsum tempor. Duis vulputate ex et ex tincidunt, quis lacinia velit aliquet. Duis non efficitur nisi, id malesuada justo. Maecenas sagittis felis ac sagittis semper. Curabitur purus leo, tempus sed finibus eget, fringilla quis risus. Maecenas et lorem quis sem varius sagittis et a est. Maecenas iaculis iaculis sem. Donec vel dolor at arcu tincidunt bibendum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Fusce ut aliquet justo. Donec id neque ipsum. Integer eget ultricies odio. Nam vel ex a orci fringilla tincidunt. Aliquam eleifend ligula non velit accumsan cursus. Etiam ut gravida sapien.

-

Vestibulum ultrices risus velit, sit amet blandit massa auctor sit amet. Sed eu lectus sem. Phasellus in odio at ipsum porttitor mollis id vel diam. Praesent sit amet posuere risus, eu faucibus lectus. Vivamus ex ligula, tempus pulvinar ipsum in, auctor porta quam. Proin nec dui cursus, posuere dui eget interdum. Fusce lectus magna, sagittis at facilisis vitae, pellentesque at etiam. Quisque posuere leo quis sem commodo, vel scelerisque nisi scelerisque. Suspendisse id quam vel tortor tincidunt suscipit. Nullam auctor orci eu dolor consectetur, interdum ullamcorper ante tincidunt. Mauris felis nec felis elementum varius. Nam sapien ante, varius in pulvinar vitae, rhoncus id massa. Donec varius ex in mauris ornare, eget euismod urna egestas. Etiam lacinia tempor ipsum, sodales porttitor justo. Aliquam dolor quam, semper in tortor eu, volutpat efficitur quam. Fusce nec fermentum nisl. Aenean erat diam, tempus aliquet erat. Etiam iaculis nulla ipsum, et pharetra libero rhoncus ut. Phasellus rutrum cursus velit, eget condimentum nunc blandit vel. In at pulvinar lectus. Morbi diam ante, vulputate et imperdiet eget, fermentum non dolor. Ut eleifend sagittis tincidunt. Sed viverra commodo mi, ac rhoncus justo. Duis neque ligula, elementum ut enim vel, posuere finibus justo. Vivamus facilisis maximus nibh quis pulvinar. Quisque hendrerit in ipsum id tellus facilisis fermentum. Proin mauris dui.

-
From 0d382bdde9dc4120300c7a5e96ecf9a5d01bc3b7 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:16:15 +0200 Subject: [PATCH 08/13] Remove contact page (moving to contact.html). --- src/contact.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/contact.md diff --git a/src/contact.md b/src/contact.md deleted file mode 100644 index 5877e74..0000000 --- a/src/contact.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -layout: page -title: Contact ---- - -### Get in touch by email: - -[autonomic@posteo.net](mailto:autonomic@posteo.net) - -[Download PGP Key]({{ "/assets/pgp/autonomic-key.asc" | relative_url }}) - -Fingerprint: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147 - From f620ac886e087ac349b390f617d77f1a4cc8ec3a Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:16:51 +0200 Subject: [PATCH 09/13] Rename contact related CSS file from 'cta'. --- src/assets/styles/components/_contact.scss | 37 ++++++++++++++++ src/assets/styles/components/_cta.scss | 50 ---------------------- src/assets/styles/main.scss | 2 +- 3 files changed, 38 insertions(+), 51 deletions(-) create mode 100644 src/assets/styles/components/_contact.scss delete mode 100644 src/assets/styles/components/_cta.scss diff --git a/src/assets/styles/components/_contact.scss b/src/assets/styles/components/_contact.scss new file mode 100644 index 0000000..8511a71 --- /dev/null +++ b/src/assets/styles/components/_contact.scss @@ -0,0 +1,37 @@ +#contact { + header { + @include vendor('order', '1'); + + p { + color: inherit; + } + } + + .actions { + @include vendor('order', '2'); + width: 30%; + } + + @include breakpoint(medium) { + display: block; + text-align: center; + + header { + padding-right: 0; + width: 100%; + } + + .actions { + margin-left: auto; + margin-right: auto; + max-width: 20em; + width: 100%; + } + } + + @include breakpoint(small) { + .actions { + max-width: none; + } + } +} diff --git a/src/assets/styles/components/_cta.scss b/src/assets/styles/components/_cta.scss deleted file mode 100644 index 94d8c67..0000000 --- a/src/assets/styles/components/_cta.scss +++ /dev/null @@ -1,50 +0,0 @@ - - - - -/* CTA */ - -#cta { - .inner { - @include vendor('display', 'flex'); - max-width: 45em; - - header { - @include vendor('order', '1'); - padding-right: 3em; - width: 70%; - - p { - color: inherit; - } - } - - .actions { - @include vendor('order', '2'); - width: 30%; - } - - @include breakpoint(medium) { - display: block; - text-align: center; - - header { - padding-right: 0; - width: 100%; - } - - .actions { - margin-left: auto; - margin-right: auto; - max-width: 20em; - width: 100%; - } - } - - @include breakpoint(small) { - .actions { - max-width: none; - } - } - } -} \ No newline at end of file diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index 865e9be..8e816d5 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -42,7 +42,7 @@ @import 'components/menu'; @import 'components/header'; @import 'components/banner'; -@import 'components/cta'; +@import 'components/contact'; /* Main */ From ff5dbc84a6166dc5550fe9aa6aaa1e5e94c0d8c9 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:35:49 +0200 Subject: [PATCH 10/13] Add content for contact section. --- src/_includes/contact.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/_includes/contact.html b/src/_includes/contact.html index 9f72197..06f89b5 100644 --- a/src/_includes/contact.html +++ b/src/_includes/contact.html @@ -1,11 +1,12 @@ -
-
-
-

Get in Touch

-

Contact us to discuss your project's needs and arrange a consultation.

-
- -
+ +
+
+

Get in Touch

+

Contact us to discuss your project's needs and arrange a consultation.

+

We're available at autonomic@posteo.net

+

+ If you use encrypted email, here is our PGP key. + Our key fingerprint is:
82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147 +

+
From 753e0f010313a2042202e702ee942ef78a46bcf3 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:36:05 +0200 Subject: [PATCH 11/13] Add anchor and wrap text for core values section. --- src/_includes/core-values.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/_includes/core-values.html b/src/_includes/core-values.html index baa1d35..81c79d5 100644 --- a/src/_includes/core-values.html +++ b/src/_includes/core-values.html @@ -1,11 +1,14 @@ - +
-

Autonomic is a co-operative
- that is owned and run by its workers

-

We build technologies and infrastructure to empower users to make a positive
- impact on the world. All of our services reflect our commitment to our core values:

+

+ Autonomic is a co-operative
that is owned and run by its workers +

+

+ We build technologies and infrastructure to empower users to make a positive
+ impact on the world. All of our services reflect our commitment to our core values: +

  • From f51d3bf47b9a02749fd1fbdcb53aa556e8e9620b Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:36:27 +0200 Subject: [PATCH 12/13] Hard code menu. Closes https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/issues/27. --- src/_includes/header.html | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/_includes/header.html b/src/_includes/header.html index acf5f3a..b64bb9f 100644 --- a/src/_includes/header.html +++ b/src/_includes/header.html @@ -1,7 +1,4 @@ -
    - -
    • From 2854202e682d67c656e456ca57327f3bc06bef66 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 29 Sep 2017 20:36:34 +0200 Subject: [PATCH 13/13] Add named anchor for services. --- src/_includes/services.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_includes/services.html b/src/_includes/services.html index 19d1280..a4e4bd2 100644 --- a/src/_includes/services.html +++ b/src/_includes/services.html @@ -1,4 +1,4 @@ - +