From 5c6ff8b3c4a9f08508323c365ce9817633c43957 Mon Sep 17 00:00:00 2001 From: escuriola Date: Wed, 16 Feb 2022 18:34:24 +0100 Subject: [PATCH 1/4] OEL-1160: Header refactor. Add logos from BCL and disable collapse in navbar. --- bcl-builder.config.js | 15 +++++++++++++++ .../patterns/navbar/pattern-navbar.html.twig | 3 +++ .../fixtures/markup_rendering_patterns/navbar.yml | 3 +++ 3 files changed, 21 insertions(+) diff --git a/bcl-builder.config.js b/bcl-builder.config.js index 32a073351..21814f4d9 100644 --- a/bcl-builder.config.js +++ b/bcl-builder.config.js @@ -44,6 +44,21 @@ module.exports = { to: path.resolve(outputFolder, "assets/bcl"), options: { up: 4 }, }, + { + from: ["node_modules/@openeuropa/bcl-theme-default/logos/ec/*.svg"], + to: path.resolve(outputFolder, "assets/logos/ec"), + options: { up: true }, + }, + { + from: ["node_modules/@openeuropa/bcl-theme-default/logos/eu/standard-version/**"], + to: path.resolve(outputFolder, "assets/logos/eu"), + options: { up: true }, + }, + { + from: ["node_modules/@openeuropa/bcl-theme-default/logos/eu/condensed-version/**"], + to: path.resolve(outputFolder, "assets/logos/eu/mobile"), + options: { up: true }, + }, ], "rename": [ { diff --git a/templates/patterns/navbar/pattern-navbar.html.twig b/templates/patterns/navbar/pattern-navbar.html.twig index 26e005b46..30b561250 100644 --- a/templates/patterns/navbar/pattern-navbar.html.twig +++ b/templates/patterns/navbar/pattern-navbar.html.twig @@ -11,6 +11,9 @@ {% if background ?? true %} {% set background = color_set %} {% endif %} +{% if not expanded_breakpoint %} + {% set disable_collapse = true %} +{% endif %} {% set expand = expanded_breakpoint|default('lg') %} {% block branding %} diff --git a/tests/src/Kernel/fixtures/markup_rendering_patterns/navbar.yml b/tests/src/Kernel/fixtures/markup_rendering_patterns/navbar.yml index cc5f2f9c5..b0645d1c4 100644 --- a/tests/src/Kernel/fixtures/markup_rendering_patterns/navbar.yml +++ b/tests/src/Kernel/fixtures/markup_rendering_patterns/navbar.yml @@ -3,6 +3,7 @@ navbar_pattern_large_light_scheme_default_breakpoint: '#type': pattern '#id': navbar '#fields': + expanded_breakpoint: 'lg' color_scheme: light branding: - '#type': pattern @@ -90,6 +91,7 @@ navbar_pattern_medium_dark_scheme_md_breakpoint: - '#type': pattern '#id': link '#fields': + expanded_breakpoint: 'lg' label: 'OpenEuropa Site' path: 'https://europa.eu/' attributes: @@ -165,6 +167,7 @@ navbar_pattern_medium_default_scheme_only_navigation: '#type': pattern '#id': navbar '#fields': + expanded_breakpoint: 'lg' navigation: - '#type': pattern '#id': link From 834a697b557ec675d4f92f897b376975712487bc Mon Sep 17 00:00:00 2001 From: escuriola Date: Fri, 18 Feb 2022 12:12:38 +0100 Subject: [PATCH 2/4] OEL-1160: Information about collapse. --- templates/patterns/navbar/navbar.ui_patterns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/patterns/navbar/navbar.ui_patterns.yml b/templates/patterns/navbar/navbar.ui_patterns.yml index 4d7f31085..146b6f423 100644 --- a/templates/patterns/navbar/navbar.ui_patterns.yml +++ b/templates/patterns/navbar/navbar.ui_patterns.yml @@ -5,7 +5,7 @@ navbar: expanded_breakpoint: type: string label: 'Expanded breakpoint' - description: 'The breakpoint at which the menu will be shown as expanded. For earlier breakpoints, it will be shown after clicking a toggle button. Must be a valid breakpoint class (sm, md, lg). Defaults to lg.' + description: 'The breakpoint at which the menu will be shown as expanded. For earlier breakpoints, it will be shown after clicking a toggle button. Must be a valid breakpoint class (sm, md, lg). Defaults to lg. If not present, then will not collapse.' color_scheme: type: string label: 'Color scheme' From 312153ba04b326de8d90d61b68e7a0d889f95719 Mon Sep 17 00:00:00 2001 From: escuriola Date: Mon, 21 Feb 2022 15:43:30 +0100 Subject: [PATCH 3/4] OEL-1160: Add logos folder to gitignore. --- assets/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/.gitignore b/assets/.gitignore index 081b5c395..f5c797220 100644 --- a/assets/.gitignore +++ b/assets/.gitignore @@ -2,3 +2,4 @@ /css/ /icons/ /js/ +/logos/ From e023e002a855eab17e9162eedd6758b277005339 Mon Sep 17 00:00:00 2001 From: escuriola Date: Mon, 21 Feb 2022 15:43:46 +0100 Subject: [PATCH 4/4] OEL-1160: Add preview to expanded_breakpoint. --- templates/patterns/navbar/navbar.ui_patterns.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/patterns/navbar/navbar.ui_patterns.yml b/templates/patterns/navbar/navbar.ui_patterns.yml index 146b6f423..adfe6ff7a 100644 --- a/templates/patterns/navbar/navbar.ui_patterns.yml +++ b/templates/patterns/navbar/navbar.ui_patterns.yml @@ -6,6 +6,7 @@ navbar: type: string label: 'Expanded breakpoint' description: 'The breakpoint at which the menu will be shown as expanded. For earlier breakpoints, it will be shown after clicking a toggle button. Must be a valid breakpoint class (sm, md, lg). Defaults to lg. If not present, then will not collapse.' + preview: 'lg' color_scheme: type: string label: 'Color scheme'