diff --git a/config/sync/core.entity_view_display.entity_subqueue.discover_topics.default.yml b/config/sync/core.entity_view_display.entity_subqueue.discover_topics.default.yml deleted file mode 100644 index e59f35de04..0000000000 --- a/config/sync/core.entity_view_display.entity_subqueue.discover_topics.default.yml +++ /dev/null @@ -1,34 +0,0 @@ -uuid: 8f976025-309a-4980-bd69-03d8e372c521 -langcode: en -status: true -dependencies: - config: - - entityqueue.entity_queue.discover_topics - module: - - field_delimiter - - field_formatter_range - - template_suggestion -id: entity_subqueue.discover_topics.default -targetEntityType: entity_subqueue -bundle: discover_topics -mode: default -content: - items: - label: hidden - type: entity_reference_label - weight: 0 - region: content - settings: - link: true - third_party_settings: - field_delimiter: - delimiter: '' - field_formatter_range: - limit: 0 - offset: 0 - order: 0 - template_suggestion: - template_suggestion: '' -hidden: - langcode: true - title: true diff --git a/config/sync/entityqueue.entity_queue.discover_topics.yml b/config/sync/entityqueue.entity_queue.discover_topics.yml deleted file mode 100644 index e828670c88..0000000000 --- a/config/sync/entityqueue.entity_queue.discover_topics.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 5646860a-d57a-489c-8b89-d32fe718dfec -langcode: en -status: true -dependencies: - module: - - taxonomy -id: discover_topics -label: 'Discover topics' -handler: simple -handler_configuration: { } -entity_settings: - target_type: taxonomy_term - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topic: topic - sort: - field: _none - auto_create: false - auto_create_bundle: '' -queue_settings: - min_size: 1 - max_size: 10 - act_as_queue: false - reverse: false diff --git a/config/sync/tour.tour.joinup_homepage.yml b/config/sync/tour.tour.joinup_homepage.yml index 39d734a29a..03cf9cc738 100644 --- a/config/sync/tour.tour.joinup_homepage.yml +++ b/config/sync/tour.tour.joinup_homepage.yml @@ -25,14 +25,6 @@ tips: location: left attributes: data-class: search-bar - discover_topics: - id: discover_topics - plugin: text - body: 'Or, select a topic to view relevant content items.' - weight: 3 - location: right - attributes: - data-class: view-discover-topics spotlight: id: spotlight plugin: text diff --git a/config/sync/user.role.moderator.yml b/config/sync/user.role.moderator.yml index c1fbd7b97c..d63e0516ec 100644 --- a/config/sync/user.role.moderator.yml +++ b/config/sync/user.role.moderator.yml @@ -231,7 +231,6 @@ permissions: - 'unfeature entity' - 'update any simple_block block content' - 'update collection_settings meta-entity' - - 'update discover_topics entityqueue' - 'update highlighted_event entityqueue' - 'update highlighted_solution entityqueue' - 'update paragraph content iframe' diff --git a/config/sync/views.view.curated_content_listings.yml b/config/sync/views.view.curated_content_listings.yml index 8da28174ca..635f3b37c5 100644 --- a/config/sync/views.view.curated_content_listings.yml +++ b/config/sync/views.view.curated_content_listings.yml @@ -23,7 +23,6 @@ display: type: views_multiple_permissions options: permissions: - - 'update discover_topics entityqueue' - 'update highlighted_event entityqueue' - 'update highlighted_solution entityqueue' - 'update spotlight entityqueue' diff --git a/config/sync/views.view.discover_topics.yml b/config/sync/views.view.discover_topics.yml deleted file mode 100644 index ffaadb0810..0000000000 --- a/config/sync/views.view.discover_topics.yml +++ /dev/null @@ -1,194 +0,0 @@ -uuid: 37dffbcd-38e1-4fcf-8802-8ad3041f81d3 -langcode: en -status: true -dependencies: - config: - - entityqueue.entity_queue.discover_topics - module: - - entityqueue -id: discover_topics -label: 'Discover topics' -module: views -description: '' -tag: '' -base_table: entity_subqueue_field_data -base_field: name -display: - default: - display_plugin: default - id: default - display_title: Master - position: 0 - display_options: - access: - type: none - options: { } - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: 'entity:entity_subqueue' - options: - relationship: none - view_mode: default - fields: - title: - table: entity_subqueue_field_data - field: title - id: title - entity_type: null - entity_field: title - plugin_id: field - relationship: none - group_type: group - admin_label: '' - label: '' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: string - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - filters: - status: - value: '1' - table: entity_subqueue_field_data - field: status - plugin_id: boolean - entity_type: entity_subqueue - entity_field: status - id: status - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - group: 1 - queue: - id: queue - table: entity_subqueue_field_data - field: queue - value: - discover_topics: discover_topics - entity_type: entity_subqueue - entity_field: queue - plugin_id: bundle - expose: - operator_limit_selection: false - operator_list: { } - sorts: { } - header: { } - footer: - area: - id: area - table: views - field: area - relationship: none - group_type: group - admin_label: '' - empty: false - tokenize: false - content: - value: 'See more topics' - format: full_html - plugin_id: text - empty: { } - relationships: { } - arguments: { } - display_extenders: { } - title: 'Discover topics' - use_ajax: false - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - tags: { } - block: - display_plugin: block - id: block - display_title: Block - position: 1 - display_options: - display_extenders: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - tags: { } diff --git a/tests/behat.yml.dist b/tests/behat.yml.dist index edaab95926..8dcf0029fe 100644 --- a/tests/behat.yml.dist +++ b/tests/behat.yml.dist @@ -104,7 +104,6 @@ default: Contact information inline form: '#edit-field-ar-contact-information-wrapper' Content: '.section--content-middle, main .layout-content' Cookie consent banner: '#cookie-consent-banner' - Discover topics block: '.block-views-blockdiscover-topics-block' Entity actions: '.block-joinup-local-tasks-block' Explore block: '.block-joinup-front-page-explore-block' Featured: '.region-featured' diff --git a/tests/features/homepage.feature b/tests/features/homepage.feature index a489c49ee2..e04b84abe2 100644 --- a/tests/features/homepage.feature +++ b/tests/features/homepage.feature @@ -180,65 +180,6 @@ Feature: Homepage Then I should be on the search page And I should see the "RNA vaccines" tile - # Todo: This test is disabled because of a persisting failure on CPHP which - # cannot be replicated locally. To be enabled again once we have moved to - # the new infrastructure. - # See https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-6656 - @terms @javascript @wip - Scenario Outline: Discover topics block shows a list of topics. - Given collection: - | title | Clash of vania's | - | state | validated | - And news content: - | title | headline | collection | topic | state | publication date | body | - | Some title | Some headline | Clash of vania's | E-justice | validated | 2021-04-26T19:09:00Z | Body | - | Internet medicine | It cures virtually everything | Clash of vania's | E-health Dpt. | validated | 2014-02-22T19:26:57Z | Electronic healthcare | - And the "Discover topics" content listing contains: - | type | label | - | topic | Employment and Support Allowance | - | topic | E-justice | - When I - And I am on the homepage - Then I should see the link "Employment and Support Allowance" in the "Discover topics block" - And I should see the link "E-justice" in the "Discover topics block" - When I click "E-justice" - Then I should be on the advanced search page - And the option with text "E-justice" from select facet "topic" is selected - - # See more topics modal. - When I am on the homepage - Then I should see the link "See more topics" in the "Discover topics block" - And I should not see the text "Topic categories" - And I should not see the following links in the "Discover topics block": - | Economy and Welfare | - | eGov | - | E-health Dpt. | - | HR Dpt. | - | Info | - | Law and Justice | - | Social and Political | - - When I click "See more topics" in the "Discover topics block" - Then a modal should open - And I should see the text "Topic categories" - And I should see the following links: - | Economy and Welfare | - | eGov | - | E-health Dpt. | - | HR Dpt. | - | Info | - | Law and Justice | - | Social and Political | - When I click "E-health Dpt." in the "Modal content" - Then I should be on the advanced search page - And the option with text "E-health Dpt." from select facet "topic" is selected - And the page should show the tiles "Internet medicine" - - Examples: - | logged in | - | am not logged in | - | am logged in as a user with the authenticated role | - @terms Scenario: Explore block shows a selection of news, events, collections and solutions Given users: diff --git a/tests/features/moderator/curated_content_listings.feature b/tests/features/moderator/curated_content_listings.feature index 15fdf64faf..75b3788a7f 100644 --- a/tests/features/moderator/curated_content_listings.feature +++ b/tests/features/moderator/curated_content_listings.feature @@ -10,12 +10,11 @@ Feature: Curated content listings And I click "Curated content listings" Then I should see the heading "Curated content listings" And I should see the following links: - | Discover topics | | Highlighted event | | Highlighted solution | | In the spotlight | - When I click "Discover topics" - Then I should see the heading "Update curated content listing Discover topics" + When I click "In the spotlight" + Then I should see the heading "Update curated content listing In the spotlight" And I should see the button "Add item" And I should see the button "Save" And I should see the button "Reverse" diff --git a/web/modules/custom/joinup_front_page/joinup_front_page.module b/web/modules/custom/joinup_front_page/joinup_front_page.module index 12b0107d66..83019f2c2c 100644 --- a/web/modules/custom/joinup_front_page/joinup_front_page.module +++ b/web/modules/custom/joinup_front_page/joinup_front_page.module @@ -7,24 +7,6 @@ declare(strict_types = 1); -/** - * Implements hook_preprocess_HOOK(). - * - * The 'Discover topics' block which is shown on the front page is created using - * the Views module. The block includes a 'See more topics' link which opens a - * modal dialog with the full list of available topics. Include the necessary JS - * so that all users can interact with the modal. - */ -function joinup_front_page_preprocess_block(&$variables): void { - if (!isset($variables['derivative_plugin_id']) || $variables['derivative_plugin_id'] !== 'discover_topics-block') { - return; - } - - // Load the library. - $variables['#attached']['library'][] = 'core/jquery'; - $variables['#attached']['library'][] = 'core/drupal.dialog.ajax'; -} - /** * Implements hook_theme(). */ diff --git a/web/themes/ventuno/README.md b/web/themes/ventuno/README.md index d4fbaefffa..517402b276 100755 --- a/web/themes/ventuno/README.md +++ b/web/themes/ventuno/README.md @@ -130,7 +130,7 @@ being created: ```gherkin ... -And the "Discover topics" content listing contains: +And the "Highlighted content" content listing contains: | type | label | | topic | Employment and Support Allowance | | topic | E-justice | diff --git a/web/themes/ventuno/bcl-builder.config.js b/web/themes/ventuno/bcl-builder.config.js index 5e5c8b7595..387f4be5f7 100644 --- a/web/themes/ventuno/bcl-builder.config.js +++ b/web/themes/ventuno/bcl-builder.config.js @@ -26,6 +26,14 @@ module.exports = { sourceMap: true, }, }, + { + entry: path.resolve(outputFolder, "src/js/sticky-menu.js"), + dest: path.resolve(outputFolder, "assets/js/sticky-menu.js"), + options: { + minify: true, + sourceMap: true, + }, + }, ], styles: [ { @@ -84,6 +92,16 @@ module.exports = { to: path.resolve(outputFolder, "assets/fonts/joinup-icons"), options: { up: true }, }, + { + from: [ + path.resolve( + __dirname, + "src/images/logo.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, { from: [ path.resolve( @@ -94,6 +112,56 @@ module.exports = { to: path.resolve(outputFolder, "assets/images"), options: { up: true }, }, + { + from: [ + path.resolve( + __dirname, + "src/images/iop-eu-logo.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, + { + from: [ + path.resolve( + __dirname, + "src/images/homepage-banner.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, + { + from: [ + path.resolve( + __dirname, + "src/images/homepage-banner/background.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, + { + from: [ + path.resolve( + __dirname, + "src/images/homepage-banner/wave.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, + { + from: [ + path.resolve( + __dirname, + "src/images/homepage-banner/banner-md.svg" + ), + ], + to: path.resolve(outputFolder, "assets/images"), + options: { up: true }, + }, { from: [ path.resolve( diff --git a/web/themes/ventuno/src/images/homepage-banner/background.svg b/web/themes/ventuno/src/images/homepage-banner/background.svg new file mode 100644 index 0000000000..d5826e162e --- /dev/null +++ b/web/themes/ventuno/src/images/homepage-banner/background.svg @@ -0,0 +1 @@ + diff --git a/web/themes/ventuno/src/images/homepage-banner/banner-md.svg b/web/themes/ventuno/src/images/homepage-banner/banner-md.svg new file mode 100644 index 0000000000..530b8a92f7 --- /dev/null +++ b/web/themes/ventuno/src/images/homepage-banner/banner-md.svg @@ -0,0 +1 @@ + diff --git a/web/themes/ventuno/src/images/homepage-banner/wave.svg b/web/themes/ventuno/src/images/homepage-banner/wave.svg new file mode 100644 index 0000000000..b8dc28b01c --- /dev/null +++ b/web/themes/ventuno/src/images/homepage-banner/wave.svg @@ -0,0 +1 @@ + diff --git a/web/themes/ventuno/src/images/iop-eu-logo.svg b/web/themes/ventuno/src/images/iop-eu-logo.svg new file mode 100644 index 0000000000..1491d24adb --- /dev/null +++ b/web/themes/ventuno/src/images/iop-eu-logo.svg @@ -0,0 +1 @@ + diff --git a/web/themes/ventuno/src/images/logo.svg b/web/themes/ventuno/src/images/logo.svg index 5c1562c1de..3a6722eaef 100644 --- a/web/themes/ventuno/src/images/logo.svg +++ b/web/themes/ventuno/src/images/logo.svg @@ -1,238 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/web/themes/ventuno/src/js/sticky-menu.js b/web/themes/ventuno/src/js/sticky-menu.js new file mode 100644 index 0000000000..4e99212b02 --- /dev/null +++ b/web/themes/ventuno/src/js/sticky-menu.js @@ -0,0 +1,35 @@ +/** + * Sticky menu. + */ +Drupal.behaviors.stickyMenu = { + attach: function () { + // Make sure Webtools is done modifying the DOM + window.addEventListener('wtReady', function () { + const navbar = document.getElementById('joinup-navbar'); + let navbarOffsetTop = navbar.offsetTop; + function recalculateOffset() { + navbarOffsetTop = navbar.offsetTop; + // Remove events related to cookie banner interaction + window.removeEventListener('cck_all_accepted', recalculateOffset) + window.removeEventListener('cck_technical_accepted', recalculateOffset) + window.removeEventListener('cck_banner_hidden', recalculateOffset) + } + // Add events related to cookie banner interaction + window.addEventListener('cck_all_accepted', recalculateOffset) + window.addEventListener('cck_technical_accepted', recalculateOffset) + window.addEventListener('cck_banner_hidden', recalculateOffset) + // Run function on user scroll + window.addEventListener('scroll', function() { + if (window.pageYOffset > navbarOffsetTop) { + navbar.classList.add('js-is--sticky'); + // add the required padding top to show content behind navbar + document.body.style.paddingTop = navbar.offsetHeight + 'px'; + } else { + navbar.classList.remove('js-is--sticky'); + // remove padding top from body + document.body.style.paddingTop = '0'; + } + }); + }, { once: true }); + } +}; diff --git a/web/themes/ventuno/src/scss/components/_discover-topics-block.scss b/web/themes/ventuno/src/scss/components/_discover-topics-block.scss deleted file mode 100644 index 404382c7f9..0000000000 --- a/web/themes/ventuno/src/scss/components/_discover-topics-block.scss +++ /dev/null @@ -1,127 +0,0 @@ -.block-views-blockdiscover-topics-block { - @extend .col-lg; - > h2 { - font-size: $font-size-sm; - font-weight: $display-font-weight; - color: $gray-500; - text-transform: uppercase; - text-align: center; - @include media-breakpoint-up(lg) { - margin-top: calc(2.75rem + (1.375rem + 1.5vw)*2); // Super custom spacing to align badges with search bar - text-align: left; - } - @include media-breakpoint-up(xl) { - margin-top: calc(2.75rem + 2.5rem*2); // Super custom spacing to align badges with search bar - } - } - .view-discover-topics { - .discover-topics__items { - display: flex; - flex-wrap: wrap; - justify-content: center; - - // On mobile, limit the topics shown to occupy max 3 lines: #ISAICP-6701. - @include media-breakpoint-down(md) { - max-height: 8.4rem; - overflow: hidden; - padding: 0.1rem 0; - margin-bottom: .4rem; - } - @include media-breakpoint-up(lg) { - justify-content: flex-start; - } - .field__item { - a { - display: inline-block; - border: 1px solid $gray-300; - padding: $btn-padding-y $btn-padding-x; - background-color: $white; - color: $gray-400; - border-radius: $btn-border-radius; - margin: 0 .5rem .5rem 0; - &:hover { - text-decoration: none; - } - } - } - } - .view-footer { - text-align: center; - @include media-breakpoint-up(lg) { - text-align: left; - } - a { - display: inline-block; - padding: $btn-padding-y $btn-padding-x; - background-color: $secondary; - color: $brand; - border-radius: $btn-border-radius; - margin: 0 .5rem .5rem 0; - &:hover { - text-decoration: none; - } - } - } - } -} - -.ui-widget-overlay { - background-color: $primary; - opacity: .2; -} -.ui-dialog { - &.ui-widget-content { - border: none; - border-radius: $btn-border-radius; - @extend .pb-2; - } - .ui-widget-header { - background: none; - border: none; - @extend .px-3; - @extend .mt-2; - .ui-dialog-title { - @extend .h4; - text-transform: uppercase; - line-height: 1.4; - } - .ui-dialog-titlebar-close { - @include font-icon-before("\E806", 2rem, $gray-400); - padding: 0; - border: none; - background: no-repeat; - position: static; - float: right; - margin: 0; - } - } - .ui-dialog-content { - overflow-y: scroll; - max-height: 70vh !important; - .views-field-name { - @extend .mb-1; - a { - color: $brand; - } - } - } - @include media-breakpoint-up(md) { - min-width: 740px; - .view-topic-parent-list { - .view-content { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - margin: 0 -15px; - .views-row { - flex: 1 0 33.3%; - padding: 0 15px; - } - } - } - } - @include media-breakpoint-up(lg) { - min-width: 830px; - } - -} \ No newline at end of file diff --git a/web/themes/ventuno/src/scss/components/_global-search-block.scss b/web/themes/ventuno/src/scss/components/_global-search-block.scss index 2582f77ad9..d12665812b 100644 --- a/web/themes/ventuno/src/scss/components/_global-search-block.scss +++ b/web/themes/ventuno/src/scss/components/_global-search-block.scss @@ -1,16 +1,40 @@ -.block-joinup-search-global-search { - @extend .pt-5; - @extend .pb-2; - @extend .me-3; - @extend .col-lg; - .search-bar { - .search-bar__input { - border-style: none; - border-top-left-radius: $border-radius; - border-bottom-left-radius: $border-radius; +.region-featured { + background-size: 100% auto; + background-position: 0 55%, 0 55%; + background-image: url(../images/wave.svg), url(../images/background.svg), + linear-gradient($primary 0%, $primary 50%, #082330 50%, #082330 100%); + background-repeat: no-repeat; + @include media-breakpoint-up(md) { + background-size: auto 100%; + background-position: center; + background-image: url(../images/banner-md.svg), + linear-gradient( + to right, + $primary 0%, + $primary 30%, + #082330 30%, + #082330 100% + ); + } + .block-joinup-search-global-search { + padding-bottom: $spacer * 0.5; // 8px + @include media-breakpoint-up(lg) { + margin-right: $spacer; // 16px } - .btn-search { - @include font-icon-before("\E805", 1.2rem, inherit, inherit, 0); + .search-bar { + .search-bar__input { + font-size: $font-size-base; + border-style: none; + border-top-left-radius: $border-radius-pill; + border-bottom-left-radius: $border-radius-pill; + } + .btn-search { + @include font-icon-before("\E805", 1.2rem, $primary, inherit, 0); + border-top-right-radius: $border-radius-pill; + border-bottom-right-radius: $border-radius-pill; + color: $dark; + background-color: $white; + } } } } diff --git a/web/themes/ventuno/src/scss/components/_homepage.scss b/web/themes/ventuno/src/scss/components/_homepage.scss index 4c41c34a14..47532d6474 100644 --- a/web/themes/ventuno/src/scss/components/_homepage.scss +++ b/web/themes/ventuno/src/scss/components/_homepage.scss @@ -47,26 +47,20 @@ } } -// Region Featured -.region-featured { - background-color: $gray-200; - background: radial-gradient(circle at top, white 94%, $gray-300 6%); - @include media-breakpoint-up(md) { - background: none; - background-color: $gray-300; - position: relative; - overflow: hidden; - z-index: 0; - &:before { - content: ""; - position: absolute; - background-color: $gray-100; - width: 100%; - height: 350%; - border-radius: 50%; - top: -200%; - transform: translate(-50%, 0); - z-index: -1; - } +.iop-gradient { + // background: linear-gradient(to right, #278ebf 0%, #44bfb8 32%, #50c1b0 37%, #70c89a 45%, #a4d377 56%, #c2d962 62%, #f6921e 100%); // Full IOP gradient + background: linear-gradient( + to right, + #c2d962 0%, + #f6921e 100% + ); // Only last 2 colors + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +// Use Polyfill classes for IE fallback colours. +.iecp-u1 { + .text-light { + color: $white; } } diff --git a/web/themes/ventuno/src/scss/components/_navbar.scss b/web/themes/ventuno/src/scss/components/_navbar.scss index cb7c677249..2a453ef83c 100644 --- a/web/themes/ventuno/src/scss/components/_navbar.scss +++ b/web/themes/ventuno/src/scss/components/_navbar.scss @@ -1,8 +1,10 @@ .joinup-navbar { + z-index: 100; background-color: $primary; box-shadow: $box-shadow; padding: 0; min-height: 46px; + border-bottom: 1px solid rgba(255, 255, 255, .5); @include media-breakpoint-up(sm) { min-height: 72px; } @@ -53,7 +55,7 @@ position: absolute; right: $spacer*.75; z-index: 1; - background: $primary; + background: $white; box-shadow: $box-shadow; margin-top: 1px; padding: $spacer; // 16px @@ -123,7 +125,7 @@ } } .accordion-cta-link { - color: $white; + color: $brand; text-decoration: none; &:hover { color: $gray-200; @@ -201,9 +203,10 @@ } } .accordion-list-link { - color: $white; + color: $brand; + font-weight: $font-weight-bold; &:hover { - color: $white; + color: $brand; text-decoration: none; } } @@ -221,7 +224,7 @@ .navbar__popover { border-radius: 0 0 $border-radius $border-radius; border: none; - background-color: $primary; + background-color: $white; .popover-arrow { display: none; @@ -231,14 +234,14 @@ font-weight: $font-weight-bold; font-size: $font-size-base; // 16px margin-bottom: 0; - color: $white; + color: $brand; @include font-icon-after("\E801", 1rem); } .popover__description { font-size: $font-size-xs; // 12px margin-bottom: 0; - color: $white; + color: $brand; } } @@ -247,4 +250,11 @@ .btn-light:hover { color: $primary; } + + &.js-is--sticky { + position: fixed; + top: 0; + width: 100% + } } + diff --git a/web/themes/ventuno/src/scss/homepage.scss b/web/themes/ventuno/src/scss/homepage.scss index 0791e76be8..3c7ffa37c2 100644 --- a/web/themes/ventuno/src/scss/homepage.scss +++ b/web/themes/ventuno/src/scss/homepage.scss @@ -10,7 +10,6 @@ // Components @import "components/about-block"; -@import "components/discover-topics-block"; @import "components/homepage"; @import "components/in-the-spotlight-block"; @import "components/latest-news-block"; diff --git a/web/themes/ventuno/templates/form/joinup-search-global-search--homepage.html.twig b/web/themes/ventuno/templates/form/joinup-search-global-search--homepage.html.twig index be485eb960..b009880591 100644 --- a/web/themes/ventuno/templates/form/joinup-search-global-search--homepage.html.twig +++ b/web/themes/ventuno/templates/form/joinup-search-global-search--homepage.html.twig @@ -12,17 +12,33 @@ {% set search_url = path('view.search.page_1') %} -

{{ 'Find the interoperability
resources you need'|trans }}

-
- -
- {% for id, filter in filters %} - - {% endfor %} -
- - +
+
+ +
+
+
+ + + {% for id, filter in filters %} + + {% endfor %} +
+ + +
+
- +
+

{% trans %} + Need more search options? + + Use our advanced search + {% endtrans %}

+
+
+
+

{{ 'welcomes'|trans }}

+
+
-

{% trans %}Need more search options? Use our advanced search{% endtrans %}

diff --git a/web/themes/ventuno/templates/layout/page--home.html.twig b/web/themes/ventuno/templates/layout/page--home.html.twig index ac5c918946..5dbe83b2ab 100644 --- a/web/themes/ventuno/templates/layout/page--home.html.twig +++ b/web/themes/ventuno/templates/layout/page--home.html.twig @@ -101,10 +101,16 @@ {% endif %}
-
+
-
- {{ page.featured }} +
+
+ {{ page.featured }} +
+
+ + {{ 'Discover more'|trans }} ... +
diff --git a/web/themes/ventuno/templates/navigation/navbar.html.twig b/web/themes/ventuno/templates/navigation/navbar.html.twig index 1c44899d0c..478777b740 100644 --- a/web/themes/ventuno/templates/navigation/navbar.html.twig +++ b/web/themes/ventuno/templates/navigation/navbar.html.twig @@ -70,7 +70,7 @@ {% set list_item_attributes = create_attribute() %} {% endif %} -{% set nav_attributes = nav_attributes.addClass(_nav_classes) %} +{% set nav_attributes = nav_attributes.addClass(_nav_classes).setAttribute('id', 'joinup-navbar') %} {% set navbar_toggler_attributes = navbar_toggler_attributes.addClass(_navbar_toggler_classes) %} {% set navbar_toggler_attributes = navbar_toggler_attributes.setAttribute('type', 'button') %} {% set navbar_toggler_attributes = navbar_toggler_attributes.setAttribute('data-bs-toggle', 'collapse') %} diff --git a/web/themes/ventuno/ventuno.libraries.yml b/web/themes/ventuno/ventuno.libraries.yml index 09b8a8b68e..870df01cd5 100644 --- a/web/themes/ventuno/ventuno.libraries.yml +++ b/web/themes/ventuno/ventuno.libraries.yml @@ -2,6 +2,8 @@ homepage: css: theme: assets/css/homepage.css: {} + js: + assets/js/sticky-menu.js: { minified: true, attributes: { defer: true } } slick: js: @@ -14,7 +16,7 @@ slick: style: version: VERSION css: - theme: + base: assets/css/main.css: {} js: assets/js/oe-bcl-joinup.bundle.min.js: { minified: true }