diff --git a/data/faq.json b/data/faq.json index cbbbfc3..7fc7839 100644 --- a/data/faq.json +++ b/data/faq.json @@ -1,22 +1,18 @@ [ { - "left": "question", - "right": "answer" + "left": "How is it similar to Yunohost?", + "right": "I’m baby pug normcore pabst, irony 8-bit cronut cray direct trade fingerstache. Flannel taxidermy yr health goth hell of chicharrones fixie. Leggings pop-up fashion axe you probably haven’t heard of them, brunch pabst mixtape actually cray chambray umami thundercats iceland deep." }, { - "left": "question", - "right": "answer" + "left": "Why is this the best service?", + "right": "I’m baby pug normcore pabst, irony 8-bit cronut cray direct trade fingerstache. Flannel taxidermy yr health goth hell of chicharrones fixie. Leggings pop-up fashion axe you probably haven’t heard of them, brunch pabst mixtape actually cray chambray umami thundercats iceland deep." }, { - "left": "question", - "right": "answer" + "left": "This is another question?", + "right": "I’m baby pug normcore pabst, irony 8-bit cronut cray direct trade fingerstache. Flannel taxidermy yr health goth hell of chicharrones fixie. Leggings pop-up fashion axe you probably haven’t heard of them, brunch pabst mixtape actually cray chambray umami thundercats iceland deep." }, { - "left": "question", - "right": "answer" - }, - { - "left": "question", - "right": "answer" + "left": "How do I do the setup correctly?", + "right": "I’m baby pug normcore pabst, irony 8-bit cronut cray direct trade fingerstache. Flannel taxidermy yr health goth hell of chicharrones fixie. Leggings pop-up fashion axe you probably haven’t heard of them, brunch pabst mixtape actually cray chambray umami thundercats iceland deep." } ] \ No newline at end of file diff --git a/themes/cloud.autonomic.zone/assets/scss/main.scss b/themes/cloud.autonomic.zone/assets/scss/main.scss index 38e659e..0028ac4 100644 --- a/themes/cloud.autonomic.zone/assets/scss/main.scss +++ b/themes/cloud.autonomic.zone/assets/scss/main.scss @@ -25,17 +25,25 @@ $button-focus-box-shadow-size: 0; @import "./bulma/bulma.sass"; -@mixin public-sans-family($weight, $uri) { - font-family: 'Public Sans'; +@mixin define-manrope-family($weight, $uri) { + font-family: 'Manrope'; src: url($uri) format("woff2"); font-weight: $weight; } +@mixin thick-hr { + height: 4px; +} + @font-face { - @include public-sans-family(bold, '../font/publicsans-bold.woff2') + @include define-manrope-family(bold, '../font/manrope.bold.woff2') } @font-face { - @include public-sans-family(light, '../font/publicsans-light.woff2') + @include define-manrope-family(300, '../font/manrope.light.woff2') +} + +@font-face { + @include define-manrope-family(medium, '../font/manrope.medium.woff2') } body { @@ -43,7 +51,7 @@ body { color: $text-color; padding: 0; margin: 0; - font-family: 'Public Sans', sans-serif; + font-family: 'Manrope', sans-serif; } .question { @@ -60,44 +68,46 @@ body { } -.section { - .questions { - $top-bottom-padding: 60px; - padding-top: $top-bottom-padding; - padding-bottom: $top-bottom-padding; - } -} - .hr-header { - height: 4px; + @include thick-hr(); } hr { background-color: $text-color; border: none; height: 1px; +} - .is-autonomic { +.is-autonomic { + background-color: $autonomic-red; + color: $white; + h1 { + color: $white !important; + } + hr { + @include thick-hr(); background-color: $white; } + a { + color: $white; + text-decoration: underline; + } + .content { + padding-bottom: 20px; + } + #who-is-involved { + padding-bottom: 40px; + } } #header { background-color: $coopcloud-pink; padding: 10px; margin: 0; + } -.is-autonomic { - background-color: $autonomic-red; - color: $white; - a { - color: $white; - text-decoration: underline; - } -} - // Do not show server image when using mobile viewport // Is a little bigger than the actual mobile viewport in bulma due to the text overlapping with the server icon @media all and (min-width: 769px) { diff --git a/themes/cloud.autonomic.zone/layouts/index.html b/themes/cloud.autonomic.zone/layouts/index.html index 8b3e575..fda087f 100644 --- a/themes/cloud.autonomic.zone/layouts/index.html +++ b/themes/cloud.autonomic.zone/layouts/index.html @@ -1,8 +1,10 @@ {{ define "main" }} -{{ partial "index/server-hero.html" . }} +{{ partial "index/server_hero.html" . }} {{ partial "index/underline_points.html" (dict "context" . "title" "benefits" "data" site.Data.benefits) }} {{ partial "index/underline_points.html" (dict "context" . "title" "faq" "data" site.Data.faq) }} -{{ partial "index/autonomic-hero.html" (dict "context" . "data" $.Site.Data "pages" $.Site.Pages) }} +{{ partial "index/autonomic_hero.html" (dict "context" . "data" site.Data) }} +{{ partial "index/open_collective.html" (dict "context" . "data" site.Data) }} + {{ end }} diff --git a/themes/cloud.autonomic.zone/layouts/partials/head.html b/themes/cloud.autonomic.zone/layouts/partials/head.html index 3810c60..dcbe3e4 100644 --- a/themes/cloud.autonomic.zone/layouts/partials/head.html +++ b/themes/cloud.autonomic.zone/layouts/partials/head.html @@ -4,9 +4,9 @@ {{ $title := print .Site.Title " | " .Title }} {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} {{/* scss compiling */}} - {{ $options := (dict "targetPath" "css/style.css" "outputStyle" "compressed") }} + {{ $cssOutput := "css/style.css" }} + {{ $options := (dict "targetPath" $cssOutput "outputStyle" "compressed") }} {{ $style := resources.Get "scss/main.scss" | resources.ToCSS $options }} - - {{/* */}} + {{ $title }} diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/autonomic-hero.html b/themes/cloud.autonomic.zone/layouts/partials/index/autonomic-hero.html deleted file mode 100644 index 9d88c9b..0000000 --- a/themes/cloud.autonomic.zone/layouts/partials/index/autonomic-hero.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
-
- Autonomic Logo -
-
-

{{ site.Data.who_is_involved.text }}

- -
-
-
-
\ No newline at end of file diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html b/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html new file mode 100644 index 0000000..84b6641 --- /dev/null +++ b/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html @@ -0,0 +1,17 @@ +
+
+
+

Who is involved

+
+
+
+
+ +
+
+

{{ site.Data.who_is_involved.text }}

+ +
+
+
+
\ No newline at end of file diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/open_collective.html b/themes/cloud.autonomic.zone/layouts/partials/index/open_collective.html new file mode 100644 index 0000000..20c3dd6 --- /dev/null +++ b/themes/cloud.autonomic.zone/layouts/partials/index/open_collective.html @@ -0,0 +1,14 @@ +
+
+
+

Open Collective

+
+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ligula metus, accumsan at luctus feugiat, aliquam sit amet quam. Ut mi augue, facilisis eget pretium ut, placerat quis nisl. Fusce suscipit, ligula bibendum sodales suscipit, tortor odio blandit libero, vitae ullamcorper magna est nec arcu. Mauris a velit congue, imperdiet justo sit amet, faucibus leo. In purus ipsum, luctus quis molestie eget, pretium id velit. Mauris venenatis eu tortor id egestas. Aliquam elementum risus et mauris accumsan scelerisque. Pellentesque ultricies, lacus in viverra molestie, lorem est vehicula elit, in lobortis metus sem nec sem. Donec nec lobortis ex.

+
+
+
+
+
+
\ No newline at end of file diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/server-hero.html b/themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html similarity index 100% rename from themes/cloud.autonomic.zone/layouts/partials/index/server-hero.html rename to themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html index 5755dd2..bf9e7f3 100644 --- a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html +++ b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html @@ -2,16 +2,21 @@

{{ .title }}

+ {{ $title := lower .title }} {{ range $index, $item := .data }} {{/* Don't place
if it is the first in the list */}} {{ if gt $index 0 }}
{{ end }} -
-
-

{{ $item.left }}

+
+
+ {{ if eq $title "benefits" }} +

{{ $item.left }}

+ {{ else }} +

{{ $item.left }}

+ {{ end }}
-
+
-

{{ $item.right }}

+

{{ $item.right }}

diff --git a/themes/cloud.autonomic.zone/static/font/manrope.bold.woff2 b/themes/cloud.autonomic.zone/static/font/manrope.bold.woff2 new file mode 100644 index 0000000..c3f133c Binary files /dev/null and b/themes/cloud.autonomic.zone/static/font/manrope.bold.woff2 differ diff --git a/themes/cloud.autonomic.zone/static/font/manrope.light.woff2 b/themes/cloud.autonomic.zone/static/font/manrope.light.woff2 new file mode 100644 index 0000000..0efa5d8 Binary files /dev/null and b/themes/cloud.autonomic.zone/static/font/manrope.light.woff2 differ diff --git a/themes/cloud.autonomic.zone/static/font/manrope.medium.woff2 b/themes/cloud.autonomic.zone/static/font/manrope.medium.woff2 new file mode 100644 index 0000000..19b8b23 Binary files /dev/null and b/themes/cloud.autonomic.zone/static/font/manrope.medium.woff2 differ