From d3ea095d2b7711f4b30ba0551acc504d7bc30875 Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Wed, 26 Feb 2020 16:35:17 +0000 Subject: [PATCH 1/6] Updated services we offer to be better written --- src/_includes/services.html | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/_includes/services.html b/src/_includes/services.html index fcfae90..16ce767 100644 --- a/src/_includes/services.html +++ b/src/_includes/services.html @@ -2,7 +2,7 @@
-

Services we offer

+

Cooperative Cloud: For Organisations

This isn't an exhaustive list - if you don't see what you need, please contact us anyway.

@@ -11,13 +11,13 @@
  • -

    Wordpress websites

    +

    Websites

    - We will build and host your website, using Wordpress, which is free software and very user-friendly so you can add and edit your own content if you want to. + We offer Wordpress and static sites. Either managed or unmanaged with frictionless tools for editing and publishing that empower users. Matamo provides ethical analytics to measure impact.

    • -
  • + +
  • -

    Text and Video Chat

    +

    Team Chat

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

    Cloud Storage and Collaboration

    - Cloudron is a personal "cloud - 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. + Nextcloud for file-storage, collaborative document editing, calendars. We also host CodiMD, Etherpad, Gitea and Wekan instances.

    • -
  • +
  • @@ -80,7 +77,7 @@

    • -
  • +

  • Bespoke Development

    - For some problems, there may not be a pre-existing free software solution. Let - us guide you through the full development cycle to deliver your bespoke solution. + For some problems, there may not be a pre-existing solution. Let us guide you through the full development cycle to deliver your bespoke solution.

    • From a2f5a6cbac9664d85ce8f9fb05b81a385cf8b794 Mon Sep 17 00:00:00 2001 From: georgeowell Date: Wed, 26 Feb 2020 18:22:40 +0000 Subject: [PATCH 2/6] Tweaked footer text --- src/_includes/footer.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/_includes/footer.html b/src/_includes/footer.html index 3ac09a1..bd61635 100644 --- a/src/_includes/footer.html +++ b/src/_includes/footer.html @@ -5,8 +5,9 @@

    Get in Touch

    Contact us to discuss your project's needs and arrange a consultation. - helo@autonomic.zone
    - PGP key82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147 + helo@autonomic.zone

    + PGP key: + 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147
    From 603e5c96f11987112264b1c8da3479196d7e377a Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Fri, 28 Feb 2020 15:48:13 +0000 Subject: [PATCH 3/6] Base of a new dark theme based of dracula color scheme --- src/assets/js/main.js | 4 +-- src/assets/styles/components/_banner.scss | 2 +- src/assets/styles/libs/_drac.scss | 13 ++++++++ src/assets/styles/libs/_vars.scss | 40 ++++++++++++----------- 4 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 src/assets/styles/libs/_drac.scss diff --git a/src/assets/js/main.js b/src/assets/js/main.js index 5df2f67..c4b236b 100644 --- a/src/assets/js/main.js +++ b/src/assets/js/main.js @@ -85,7 +85,7 @@ } }, color: { - value: "#f99081" + value: "#ff5555" }, shape: { type: "circle", @@ -125,7 +125,7 @@ line_linked: { enable: true, distance: 250, - color: "#f99081", + color: "#ff5555", opacity: 0.8, width: 2 }, diff --git a/src/assets/styles/components/_banner.scss b/src/assets/styles/components/_banner.scss index c4fa00b..edb7d20 100644 --- a/src/assets/styles/components/_banner.scss +++ b/src/assets/styles/components/_banner.scss @@ -104,7 +104,7 @@ body.is-loading { .particle { position: relative; user-select: none; - background: _palette(accent3, bg); + background: _palette(bg); @include breakpoint(medium) { background: none; diff --git a/src/assets/styles/libs/_drac.scss b/src/assets/styles/libs/_drac.scss new file mode 100644 index 0000000..2e4bfee --- /dev/null +++ b/src/assets/styles/libs/_drac.scss @@ -0,0 +1,13 @@ +$background: #282a36; +$current-line: #44475a; +$selection: #44475a; +$foreground: #f8f8f2; +$dark-foreground: mix($foreground, #000, 90%); +$comment: #6272a4; +$cyan: #8be9fd; +$green: #50fa7b; +$orange: #ffb86c; +$pink: #ff79c6; +$purple: #bd93f9; +$red: #ff5555; +$yellow: #f1fa8c; \ No newline at end of file diff --git a/src/assets/styles/libs/_vars.scss b/src/assets/styles/libs/_vars.scss index c29d45e..a00b6cf 100644 --- a/src/assets/styles/libs/_vars.scss +++ b/src/assets/styles/libs/_vars.scss @@ -1,3 +1,5 @@ +@import "drac"; + // Misc. $misc: ( max-spotlights: 10, @@ -31,20 +33,20 @@ // Palette. $palette: ( - bg: #29335C, - fg: #fff, - fg-bold: #fff, - fg-light: rgba(255,255,255,0.5), - border: #fff, + bg: $background, + fg: $foreground, + fg-bold: $foreground, + fg-light: rgba($foreground, 0.5), + border: $foreground, border-bg: rgba(144,144,144,0.25), - border2: #fff, + border2: $foreground, border2-bg: rgba(144,144,144,0.5), accent1: ( - bg: #F3A712, + bg: $pink, fg-bold: #ffffff, - fg: mix(#F3A712, #ffffff, 25%), - fg-light: mix(#F3A712, #ffffff, 40%), + fg: mix($pink, #ffffff, 25%), + fg-light: mix($pink, #ffffff, 40%), border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -63,10 +65,10 @@ ), accent3: ( - bg: #ed4933, - fg-bold: #ffffff, - fg: mix(#ed4933, #ffffff, 25%), - fg-light: mix(#ed4933, #ffffff, 40%), + bg: $red, + fg-bold: $foreground, + fg: #282a36,//mix($nord11, #ffffff, 25%), + fg-light: #282a36, border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -74,10 +76,10 @@ ), accent4: ( - bg: #25558C, - fg-bold: #ffffff, - fg: mix(#25558C, #ffffff, 25%), - fg-light: mix(#25558C, #ffffff, 40%), + bg: mix(#44475a, #000, 50%), + fg-bold: $foreground, + fg: $dark-foreground, + fg-light: $dark-foreground, border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -87,8 +89,8 @@ accent5: ( bg: #e2e2e2, fg-bold: #ffffff, - fg: mix(#F3A712, #ffffff, 25%), - fg-light: mix(#F3A712, #ffffff, 40%), + fg: mix($pink, #ffffff, 25%), + fg-light: mix($pink, #ffffff, 40%), border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), From 26f02bf6d7fa34c484902ed9afbb60613b7e6dc9 Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Fri, 28 Feb 2020 15:48:13 +0000 Subject: [PATCH 4/6] Base of a new dark theme based of dracula color scheme --- src/assets/js/main.js | 4 +-- src/assets/styles/components/_banner.scss | 2 +- src/assets/styles/libs/_drac.scss | 13 ++++++++ src/assets/styles/libs/_vars.scss | 40 ++++++++++++----------- 4 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 src/assets/styles/libs/_drac.scss diff --git a/src/assets/js/main.js b/src/assets/js/main.js index 5df2f67..c4b236b 100644 --- a/src/assets/js/main.js +++ b/src/assets/js/main.js @@ -85,7 +85,7 @@ } }, color: { - value: "#f99081" + value: "#ff5555" }, shape: { type: "circle", @@ -125,7 +125,7 @@ line_linked: { enable: true, distance: 250, - color: "#f99081", + color: "#ff5555", opacity: 0.8, width: 2 }, diff --git a/src/assets/styles/components/_banner.scss b/src/assets/styles/components/_banner.scss index c4fa00b..edb7d20 100644 --- a/src/assets/styles/components/_banner.scss +++ b/src/assets/styles/components/_banner.scss @@ -104,7 +104,7 @@ body.is-loading { .particle { position: relative; user-select: none; - background: _palette(accent3, bg); + background: _palette(bg); @include breakpoint(medium) { background: none; diff --git a/src/assets/styles/libs/_drac.scss b/src/assets/styles/libs/_drac.scss new file mode 100644 index 0000000..2e4bfee --- /dev/null +++ b/src/assets/styles/libs/_drac.scss @@ -0,0 +1,13 @@ +$background: #282a36; +$current-line: #44475a; +$selection: #44475a; +$foreground: #f8f8f2; +$dark-foreground: mix($foreground, #000, 90%); +$comment: #6272a4; +$cyan: #8be9fd; +$green: #50fa7b; +$orange: #ffb86c; +$pink: #ff79c6; +$purple: #bd93f9; +$red: #ff5555; +$yellow: #f1fa8c; \ No newline at end of file diff --git a/src/assets/styles/libs/_vars.scss b/src/assets/styles/libs/_vars.scss index c29d45e..a00b6cf 100644 --- a/src/assets/styles/libs/_vars.scss +++ b/src/assets/styles/libs/_vars.scss @@ -1,3 +1,5 @@ +@import "drac"; + // Misc. $misc: ( max-spotlights: 10, @@ -31,20 +33,20 @@ // Palette. $palette: ( - bg: #29335C, - fg: #fff, - fg-bold: #fff, - fg-light: rgba(255,255,255,0.5), - border: #fff, + bg: $background, + fg: $foreground, + fg-bold: $foreground, + fg-light: rgba($foreground, 0.5), + border: $foreground, border-bg: rgba(144,144,144,0.25), - border2: #fff, + border2: $foreground, border2-bg: rgba(144,144,144,0.5), accent1: ( - bg: #F3A712, + bg: $pink, fg-bold: #ffffff, - fg: mix(#F3A712, #ffffff, 25%), - fg-light: mix(#F3A712, #ffffff, 40%), + fg: mix($pink, #ffffff, 25%), + fg-light: mix($pink, #ffffff, 40%), border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -63,10 +65,10 @@ ), accent3: ( - bg: #ed4933, - fg-bold: #ffffff, - fg: mix(#ed4933, #ffffff, 25%), - fg-light: mix(#ed4933, #ffffff, 40%), + bg: $red, + fg-bold: $foreground, + fg: #282a36,//mix($nord11, #ffffff, 25%), + fg-light: #282a36, border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -74,10 +76,10 @@ ), accent4: ( - bg: #25558C, - fg-bold: #ffffff, - fg: mix(#25558C, #ffffff, 25%), - fg-light: mix(#25558C, #ffffff, 40%), + bg: mix(#44475a, #000, 50%), + fg-bold: $foreground, + fg: $dark-foreground, + fg-light: $dark-foreground, border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), @@ -87,8 +89,8 @@ accent5: ( bg: #e2e2e2, fg-bold: #ffffff, - fg: mix(#F3A712, #ffffff, 25%), - fg-light: mix(#F3A712, #ffffff, 40%), + fg: mix($pink, #ffffff, 25%), + fg-light: mix($pink, #ffffff, 40%), border: rgba(0,0,0,0.125), border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), From 9267f4b6df6226de06c9f90647656a1df128034d Mon Sep 17 00:00:00 2001 From: georgeowell Date: Fri, 28 Feb 2020 18:38:42 +0000 Subject: [PATCH 5/6] Removed fullstop and added two dots thing --- src/_includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_includes/footer.html b/src/_includes/footer.html index bd61635..e5b30c8 100644 --- a/src/_includes/footer.html +++ b/src/_includes/footer.html @@ -4,7 +4,7 @@

    Get in Touch

    - Contact us to discuss your project's needs and arrange a consultation. + Contact us to discuss your project's needs and arrange a consultation: helo@autonomic.zone

    PGP key: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147 From ced5e881348d3a21e75549dbb5ac264c93bc8893 Mon Sep 17 00:00:00 2001 From: georgeowell Date: Fri, 28 Feb 2020 18:46:09 +0000 Subject: [PATCH 6/6] Added email address back to services we offer section and tweaker grammar --- src/_includes/services.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_includes/services.html b/src/_includes/services.html index 16ce767..47e1757 100644 --- a/src/_includes/services.html +++ b/src/_includes/services.html @@ -4,7 +4,8 @@

    Cooperative Cloud: For Organisations

    - This isn't an exhaustive list - if you don't see what you need, please contact us anyway. + This isn't an exhaustive list. If you don't see what you need, please contact us anyway:
    +

    helo@autonomic.zone