From d87f2de31093f31a69a32a61cc2e33692bc6146f Mon Sep 17 00:00:00 2001 From: BJ Szyjakowski Date: Tue, 27 Jun 2023 15:51:54 -0500 Subject: [PATCH 1/4] update: prep work for lang switcher versioning --- src/css/components/_header.css | 13 +++ src/templates/partials/header.html | 170 ++++++++++++++++++++++++++++- 2 files changed, 177 insertions(+), 6 deletions(-) diff --git a/src/css/components/_header.css b/src/css/components/_header.css index 8fd3275fa..6ed1ea027 100644 --- a/src/css/components/_header.css +++ b/src/css/components/_header.css @@ -337,6 +337,19 @@ .header__language-switcher .lang_list_class:after { content: none; } + + /* V1 lang switcher updates to keep "in line" w/ v0 mobile styles */ + .header__language-switcher .hs-language-switcher__menu { + display: block; + box-shadow:none!important; + background: transparent; + } + .header__language-switcher .hs-language-switcher__menu a { + font-size: 20px!important; + } + .header__language-switcher .hs-language-switcher__button { + display: none; + } } /* Navigation */ diff --git a/src/templates/partials/header.html b/src/templates/partials/header.html index 638c614cb..53bde030b 100644 --- a/src/templates/partials/header.html +++ b/src/templates/partials/header.html @@ -2,6 +2,164 @@ templateType: global_partial label: Website header --> + +{% macro add_lang_siwtcher() %} + {% if get_asset_version('@hubspot/language_switcher') == 1 %} + {% module "language-switcher" + path="@hubspot/language_switcher", + label="Language switcher", + display_mode="localized" + styles={ + "group_button" : { + "group_alignment" : { + "alignment" : { + "horizontal_align" : "RIGHT" + } + }, + "group_background" : { + "color" : { + "color" : "#000000", + "opacity" : 0 + } + }, + "group_border" : { + "border" : { + "bottom" : { + "style" : "none" + }, + "left" : { + "style" : "none" + }, + "right" : { + "style" : "none" + }, + "top" : { + "style" : "none" + } + } + }, + "group_chevron" : { + "color" : { + "color" : "#516d8d", + "opacity" : 100 + }, + "size" : 10, + "spacing" : 10 + }, + "group_corner" : { + "radius" : 0 + }, + "group_icon" : { + "color" : { + "color" : "#516d8d", + "opacity" : 100 + }, + "size" : 15, + "spacing" : 10 + }, + "group_spacing" : { + "spacing" : { + "padding" : { + "bottom" : { + "units" : "px", + "value" : 7 + }, + "left" : { + "units" : "px", + "value" : 15 + }, + "right" : { + "units" : "px", + "value" : 15 + }, + "top" : { + "units" : "px", + "value" : 7 + } + } + } + }, + "group_text" : { + "font" : { + "color" : "#516d8d", + "size" : 18, + "size_unit" : "px" + } + } + }, + "group_dropdown" : { + "group_border" : { + "border" : { + "bottom" : { + "color" : "#000000", + "opacity" : 100, + "style" : "none", + "width" : { + "units" : "px", + "value" : 1 + } + }, + "left" : { + "color" : "#000000", + "opacity" : 100, + "style" : "none", + "width" : { + "units" : "px", + "value" : 1 + } + }, + "right" : { + "color" : "#000000", + "opacity" : 100, + "style" : "none", + "width" : { + "units" : "px", + "value" : 1 + } + }, + "top" : { + "color" : "#000000", + "opacity" : 100, + "style" : "none", + "width" : { + "units" : "px", + "value" : 1 + } + } + } + }, + "group_box_shadow" : { + "add_box_shadow" : true + }, + "group_hover" : { + "group_background" : { + "color" : { + "color" : "#f8fafc", + "opacity" : 100 + } + } + }, + "group_text" : { + "font" : { + "color" : "#516d8d", + "size" : 16, + "size_unit" : "px" + } + } + } + }, + add_chevron_down=true, + icon_options="icon" + %} + {% else %} + {% module "language-switcher" + path="@hubspot/language_switcher", + label="Language switcher", + display_mode="localized" + %} +
{{ locale_name(locale) }}
+ {% endif %} +{% endmacro %}
{# The link below is used for a navigation skipper which allows users navigating the site with their keyboard to skip over the site navigation. More information on the navigation skipper can be found here: https://github.com/HubSpot/cms-theme-boilerplate/wiki/Accessibility #} @@ -37,16 +195,16 @@ {# Header navigation row one #} + +
{% if content.translated_content.values()|selectattr("published")|length or is_listing_view and group.translations %}
- {% module "language-switcher" - path="@hubspot/language_switcher", - label="Language switcher", - display_mode="localized" - %} -
{{ locale_name(locale) }}
+ + {{ add_lang_siwtcher() }} + +
{% endif %} From 5e84b5d0b92c10201194892b85d139f4bff846a1 Mon Sep 17 00:00:00 2001 From: BJ Szyjakowski Date: Tue, 27 Jun 2023 16:01:51 -0500 Subject: [PATCH 2/4] update: remove extra whitespace --- src/templates/partials/header.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/templates/partials/header.html b/src/templates/partials/header.html index 53bde030b..c7e58577a 100644 --- a/src/templates/partials/header.html +++ b/src/templates/partials/header.html @@ -201,10 +201,7 @@ {% if content.translated_content.values()|selectattr("published")|length or is_listing_view and group.translations %}
- {{ add_lang_siwtcher() }} - -
{% endif %} From ee77dd0d684059defd45f039f068c81568c9a355 Mon Sep 17 00:00:00 2001 From: BJ Szyjakowski Date: Tue, 27 Jun 2023 16:12:02 -0500 Subject: [PATCH 3/4] update: PR fixes - macro spelling - version conditionals --- src/css/components/_header.css | 26 ++++++++++++++------------ src/templates/partials/header.html | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/css/components/_header.css b/src/css/components/_header.css index 6ed1ea027..45b5ef57b 100644 --- a/src/css/components/_header.css +++ b/src/css/components/_header.css @@ -338,18 +338,20 @@ content: none; } - /* V1 lang switcher updates to keep "in line" w/ v0 mobile styles */ - .header__language-switcher .hs-language-switcher__menu { - display: block; - box-shadow:none!important; - background: transparent; - } - .header__language-switcher .hs-language-switcher__menu a { - font-size: 20px!important; - } - .header__language-switcher .hs-language-switcher__button { - display: none; - } + {%- if get_asset_version('@hubspot/language_switcher') == 1 %} + /* V1 lang switcher updates to keep "in line" w/ v0 mobile styles */ + .header__language-switcher .hs-language-switcher__menu { + display: block; + box-shadow:none!important; + background: transparent; + } + .header__language-switcher .hs-language-switcher__menu a { + font-size: 20px!important; + } + .header__language-switcher .hs-language-switcher__button { + display: none; + } + {% endif -%} } /* Navigation */ diff --git a/src/templates/partials/header.html b/src/templates/partials/header.html index c7e58577a..d3a1d7f08 100644 --- a/src/templates/partials/header.html +++ b/src/templates/partials/header.html @@ -3,7 +3,7 @@ label: Website header --> -{% macro add_lang_siwtcher() %} +{% macro add_lang_switcher() %} {% if get_asset_version('@hubspot/language_switcher') == 1 %} {% module "language-switcher" path="@hubspot/language_switcher", @@ -201,7 +201,7 @@ {% if content.translated_content.values()|selectattr("published")|length or is_listing_view and group.translations %}
- {{ add_lang_siwtcher() }} + {{ add_lang_switcher() }}
{% endif %} From ffe1b6e48fc679205926429bd82993a2d4e8ab0e Mon Sep 17 00:00:00 2001 From: BJ Szyjakowski Date: Tue, 27 Jun 2023 16:17:11 -0500 Subject: [PATCH 4/4] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06e78590f..50426b3d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hubspot/cms-theme-boilerplate", - "version": "3.12.1", + "version": "3.13.0", "description": "Boilerplate project for building websites on the HubSpot CMS", "repository": { "type": "git",