Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OEL-1160: Header refactor. #71

Merged
merged 40 commits into from
Mar 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
eba124f
OEL-1160: Remove header pattern.
escuriola Feb 16, 2022
1ebf886
OEL-1160: Remove extra CorporateBlock for logos, now are inside brand…
escuriola Feb 16, 2022
74df5df
OEL-1160: Add EuropeanLanguages helper class.
escuriola Feb 16, 2022
4671872
OEL-1160: Create page template to BCL branding.
escuriola Feb 16, 2022
4da077e
OEL-1160: Add block and remove header pattern from page template.
escuriola Feb 16, 2022
35ac939
OEL-1160: Add template to region branding header top right.
escuriola Feb 16, 2022
a96ec43
OEL-1160: Add language filter to twig.
escuriola Feb 16, 2022
b1225dc
OEL-1160: Add page branding suggestion and preprocess variables.
escuriola Feb 16, 2022
49ed6ca
OEL-1160: Adapt branding logos to component_library.
escuriola Feb 16, 2022
de13e0e
OEL-1160: Fix theme logo and language management.
escuriola Feb 17, 2022
07613e3
OEL-1160: Fixing test, WIP.
escuriola Feb 17, 2022
3aa5896
OEL-1160: Remove branding page template. Put all header in page templ…
escuriola Feb 18, 2022
c3214dc
OEL-1160: Branding with site name and site logo. Testing.
escuriola Feb 18, 2022
a7b3fa6
OEL-1160: Theme variables refactor. Add theme settings to schema.
escuriola Feb 18, 2022
54aaa42
OEL-1160: Corporate logo testing.
escuriola Feb 18, 2022
8a27c70
OEL-1160: Remove branding block preprocess. Add variables to neutral …
escuriola Feb 21, 2022
2b96bdb
OEL-1160: Adjust neutral logo.
escuriola Feb 21, 2022
ca8dd26
OEL-1160: Remove obsolete suggestion.
escuriola Feb 21, 2022
b6fd0c5
OEL-1160: Type declaration.
escuriola Feb 22, 2022
2ae9f19
OEL-1160: Minor code cleaning.
escuriola Feb 22, 2022
6a17ac4
OEL-1160: Neutral as default.
escuriola Feb 22, 2022
44897c2
OEL-1160: Adjust header blocks.
escuriola Feb 22, 2022
5fe9e52
OEL-1160: Add main navigation block to header.
escuriola Feb 22, 2022
af0192c
OEL-1160: Remove logos from oe_whitelabel.
escuriola Feb 23, 2022
4d8c071
OEL-1160: Remove obsolete blocks.
escuriola Feb 23, 2022
cc7da31
OEL-1160: Apply spaceless and minor block template refactor.
escuriola Feb 23, 2022
ff45cd9
OEL-1160: Improve testing.
escuriola Feb 23, 2022
4196fe0
OEL-1160: Minor page template refactor.
escuriola Feb 23, 2022
35a6a4a
OEL-1160: Minor refactor, removing non-valid lines and perform comments.
escuriola Feb 23, 2022
657924a
OEL-1160: Add class to link to display correctly on mobile.
escuriola Feb 23, 2022
b02a00e
OEL-1160: Refactor. Remove attributes object and add attributes direc…
escuriola Mar 3, 2022
7c587c9
OEL-1160: Refactor. Join home title.
escuriola Mar 3, 2022
f345460
OEL-1160: Refactor. Improve testing.
escuriola Mar 3, 2022
f7e58cc
OEL-1160: Refactor. Fix template file information.
escuriola Mar 3, 2022
1510a63
OEL-1160: Refactor. Remove attributes object.
escuriola Mar 3, 2022
cb67343
OEL-1160: Refactor. Remove ul from header top right links.
escuriola Mar 3, 2022
4e7baef
OEL-1160: Fix header branding top right links. Make them responsive.
escuriola Mar 8, 2022
2f5584a
OEL-1160: Point to ticket branch for oe_bootstrap_theme.
brummbar Mar 11, 2022
24e2ad5
OEL-1160: Remove patch.
escuriola Mar 14, 2022
315e126
OEL-1160: Add diff patch with 1.x.
escuriola Mar 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
}
}
},
"patches": {
"openeuropa/oe_bootstrap_theme" : {
"1.x latest": "https://github.com/openeuropa/oe_bootstrap_theme/compare/1.0.0-alpha7..1.x.diff"
}
},
"drupal-scaffold": {
"locations": {
"web-root": "./build"
Expand Down
2 changes: 1 addition & 1 deletion config/install/oe_whitelabel.settings.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
component_library: ec
component_library: neutral
header_style: standard
2 changes: 1 addition & 1 deletion config/optional/block.block.oe_whitelabel_branding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_branding
theme: oe_whitelabel
region: header_top
region: navbar_branding
weight: -2
provider: null
plugin: system_branding_block
Expand Down
19 changes: 0 additions & 19 deletions config/optional/block.block.oe_whitelabel_ec_logo.yml

This file was deleted.

24 changes: 24 additions & 0 deletions config/optional/block.block.oe_whitelabel_main_navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
langcode: en
status: true
dependencies:
config:
- system.menu.main
module:
- system
theme:
- oe_whitelabel
id: oe_whitelabel_main_navigation
theme: oe_whitelabel
region: header_left
weight: 0
provider: null
plugin: 'system_menu_block:main'
settings:
id: 'system_menu_block:main'
label: 'Main navigation'
label_display: '0'
provider: system
level: 1
depth: 0
expand_all_items: false
visibility: { }
2 changes: 1 addition & 1 deletion config/schema/oe_whitelabel.schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ oe_whitelabel.settings:
mapping:
component_library:
type: string
label: 'BCL component library, either EC or EU'
label: 'BCL component library, either EC, EU or neutral'
header_style:
type: string
label: 'Header style, either Blue header or Light header'
233 changes: 0 additions & 233 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--bg.svg

This file was deleted.

207 changes: 0 additions & 207 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--cs.svg

This file was deleted.

235 changes: 0 additions & 235 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--da.svg

This file was deleted.

243 changes: 0 additions & 243 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--de.svg

This file was deleted.

204 changes: 0 additions & 204 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--el.svg

This file was deleted.

233 changes: 0 additions & 233 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--en.svg

This file was deleted.

210 changes: 0 additions & 210 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--es.svg

This file was deleted.

207 changes: 0 additions & 207 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--et.svg

This file was deleted.

219 changes: 0 additions & 219 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--fi.svg

This file was deleted.

This file was deleted.

221 changes: 0 additions & 221 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--ga.svg

This file was deleted.

216 changes: 0 additions & 216 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--hr.svg

This file was deleted.

218 changes: 0 additions & 218 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--hu.svg

This file was deleted.

241 changes: 0 additions & 241 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--it.svg

This file was deleted.

203 changes: 0 additions & 203 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--lt.svg

This file was deleted.

212 changes: 0 additions & 212 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--lv.svg

This file was deleted.

239 changes: 0 additions & 239 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--mt.svg

This file was deleted.

52 changes: 0 additions & 52 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--mute.svg

This file was deleted.

231 changes: 0 additions & 231 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--nl.svg

This file was deleted.

225 changes: 0 additions & 225 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--pl.svg

This file was deleted.

228 changes: 0 additions & 228 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--pt-pt.svg

This file was deleted.

225 changes: 0 additions & 225 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--ro.svg

This file was deleted.

217 changes: 0 additions & 217 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--sk.svg

This file was deleted.

216 changes: 0 additions & 216 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--sl.svg

This file was deleted.

254 changes: 0 additions & 254 deletions modules/oe_whitelabel_helper/images/logos/ec/logo-ec--sv.svg

This file was deleted.

34 changes: 0 additions & 34 deletions modules/oe_whitelabel_helper/images/logos/eu/logo-eu--bg.svg
Diff not rendered.
Loading