From 2b469a920eb59b535d5739a5edc30a15b05fa5ab Mon Sep 17 00:00:00 2001 From: meow Date: Mon, 20 Jan 2020 15:09:35 +0500 Subject: [PATCH 1/9] Generic header added --- assets/u/static/generic-header.css | 23 +++++++++++++++++++ .../u/products/zero-carbon-cloud/contents.lr | 16 +++++++++++++ flowblocks/generic-header.ini | 22 ++++++++++++++++++ models/product.ini | 4 ++++ templates/blocks/generic-header.html | 7 ++++++ templates/layout-2020.html | 19 +++++++++++++-- 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 assets/u/static/generic-header.css create mode 100644 flowblocks/generic-header.ini create mode 100644 templates/blocks/generic-header.html diff --git a/assets/u/static/generic-header.css b/assets/u/static/generic-header.css new file mode 100644 index 0000000..6ab12a5 --- /dev/null +++ b/assets/u/static/generic-header.css @@ -0,0 +1,23 @@ +.blue-bg { + background-color: #40a9e3; +} + +.black-bg { + background-color: black; +} + +.red-bg { + background-color: #d1240c; +} + +.green-bg { + background-color: #5cab06; +} + + +h1.generic-header { + line-height: 6rem; + text-transform: uppercase; + font-size: 7rem; +} + \ No newline at end of file diff --git a/content/u/products/zero-carbon-cloud/contents.lr b/content/u/products/zero-carbon-cloud/contents.lr index ad8fe91..4de0e60 100644 --- a/content/u/products/zero-carbon-cloud/contents.lr +++ b/content/u/products/zero-carbon-cloud/contents.lr @@ -21,6 +21,7 @@ feature3_title: Go fully conscious feature3_text: Our services are mission-coherent: slim down everything as much as possible for reducing computer power and energy consumption. --- content1_text: + ## What is Zero Carbon Cloud? In the era of rapid climate change and sea level rise, we're here to provide an alternative system that does not use environmentally harmful energy sources. It is a safe and clean alternative to your dropbox or google cloud: our cloud storage service is built with sustainability to its core: it is fully renewable and fully recycled. @@ -80,6 +81,7 @@ content2_image: /u/image/zerocarbon-no.jpg offer1_title: 100 GB @ 23CHF/month --- offer1_text: + * **One free IPv6 VPN** included for increased security * Datacenter location: Glarus, Switzerland * Enhanced security by limiting access to only your devices @@ -92,6 +94,7 @@ offer1_link: https://ungleich.ch offer2_title: 1 TB @ 36.5CHF/month --- offer2_text: + * **Two free IPv6 VPNs** included for increased security * Datacenter location: Glarus, Switzerland * Enhanced security by limiting access @@ -105,6 +108,7 @@ offer2_link: https://ungleich.ch offer3_title: 50 TB @ 540 CHF/month --- offer3_text: + * **Ten free IPv6 VPNs** included for increased security * Datacenter location: Glarus, Switzerland * Enhanced security by limiting access to only your devices @@ -115,3 +119,15 @@ Recommended for medium to large organisations --- offer3_link: https://ungleich.ch --- +header: + +#### generic-header #### +headers: + +carbon free +zero carbon +cloud solution +---- +primary_color: blue +---- +header_color: text-light diff --git a/flowblocks/generic-header.ini b/flowblocks/generic-header.ini new file mode 100644 index 0000000..cb01ca7 --- /dev/null +++ b/flowblocks/generic-header.ini @@ -0,0 +1,22 @@ +[block] +name = generic-header + +[fields.headers] +label = headers +type = strings + +[fields.primary_color] +name = Landing Page Primary Color +label = primary_color +type = select +choices = blue, black, red, green +choice_labels = Blue, Black, Red, Green +default = blue + +[fields.header_color] +name = Header Color +label = header_color +type = select +choices = text-light, text-dark +choice_labels = light, dark +default = text-light \ No newline at end of file diff --git a/models/product.ini b/models/product.ini index 10ad499..1cd557b 100644 --- a/models/product.ini +++ b/models/product.ini @@ -12,6 +12,10 @@ size = large label = Subtitle type = string +[fields.header] +type = flow +flow_blocks = generic-header + [fields.description1] label = Description 1 type = markdown diff --git a/templates/blocks/generic-header.html b/templates/blocks/generic-header.html new file mode 100644 index 0000000..fc69d2c --- /dev/null +++ b/templates/blocks/generic-header.html @@ -0,0 +1,7 @@ +
+
+ {% for h in this.headers %} +

{{h}}

+ {% endfor %} +
+
\ No newline at end of file diff --git a/templates/layout-2020.html b/templates/layout-2020.html index 13a4f2f..1f1a23c 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -11,6 +11,7 @@ href="/u/static/bootstrap-4.4.1-dist/css/bootstrap.min.css"> +