From a5c4ad4a60e2a84dd253b046c56b4a0ddac811ce Mon Sep 17 00:00:00 2001 From: meow Date: Wed, 22 Jan 2020 23:18:05 +0500 Subject: [PATCH] Header Color now accept hex value + Navigation Color Option added + Make font size smaller for mobile devices for landing page --- assets/u/static/generic-header.css | 25 ++++++++++++++++++- .../u/products/zero-carbon-cloud/contents.lr | 4 ++- flowblocks/generic-header.ini | 14 +++++++---- templates/blocks/generic-header.html | 2 +- templates/layout-2020.html | 11 +++----- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/assets/u/static/generic-header.css b/assets/u/static/generic-header.css index 6127197..c8ccbcf 100644 --- a/assets/u/static/generic-header.css +++ b/assets/u/static/generic-header.css @@ -1,7 +1,30 @@ :root { - font-size: 16px; + font-size: 14px; } +h3 { + font-size: 1.5rem; +} + +h2 { + font-size: 1.75rem; +} + +.mb-5 { + margin-bottom: 1.5rem !important; +} + +/* Extra large devices (large laptops and desktops, 1200px and up) */ +@media only screen and (min-width: 1200px) { + :root { + font-size: 16px; + } + .mb-5 { + margin-bottom: 3rem !important; + } +} + + .blue-bg { background-color: #40a9e3; } diff --git a/content/u/products/zero-carbon-cloud/contents.lr b/content/u/products/zero-carbon-cloud/contents.lr index ad07f1e..7894d37 100644 --- a/content/u/products/zero-carbon-cloud/contents.lr +++ b/content/u/products/zero-carbon-cloud/contents.lr @@ -126,6 +126,8 @@ don't offset go zero carbon zero carbon cloud ---- -primary_color: blue +primary_color: #40a9e3 ---- header_color: text-light +---- +nav_link_color: navbar-dark diff --git a/flowblocks/generic-header.ini b/flowblocks/generic-header.ini index cb01ca7..b5c9dbd 100644 --- a/flowblocks/generic-header.ini +++ b/flowblocks/generic-header.ini @@ -8,10 +8,7 @@ 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 +type = string [fields.header_color] name = Header Color @@ -19,4 +16,11 @@ label = header_color type = select choices = text-light, text-dark choice_labels = light, dark -default = text-light \ No newline at end of file +default = text-light + +[fields.nav_link_color] +name = Navigation Link Color +type = select +choices = navbar-light, navbar-dark +choice_labels = dark, light +default = dark diff --git a/templates/blocks/generic-header.html b/templates/blocks/generic-header.html index fc69d2c..ea2fe98 100644 --- a/templates/blocks/generic-header.html +++ b/templates/blocks/generic-header.html @@ -1,4 +1,4 @@ -
+
{% for h in this.headers %}

{{h}}

diff --git a/templates/layout-2020.html b/templates/layout-2020.html index 4c78b87..91f679f 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -28,17 +28,14 @@ {% if this.header %} - {% set nav_classes = this.header.blocks[0].primary_color + '-bg' %} - {% if this.header.blocks[0].primary_color != 'Black' %} - {% set nav_classes = nav_classes + ' navbar-dark' %} - {% else %} - {% set nav_classes = nav_classes + ' navbar-light' %} - {% endif %} + {% set nav_style = 'background-color:' + this.header.blocks[0].primary_color + ';' %} + {% set nav_classes = this.header.blocks[0].nav_link_color %} {% else %} {% set nav_classes = 'navbar-light bg-light' %} {% endif %} -