# Conflicts:
#   CHANGELOG.md
#   cern_components.info.yml

Merge branch 'rc-v2.6.0' of https://gitlab.cern.ch/web-team/drupal/public/d8/modules/cern-components into rc-v2.6.0

Resolve "Finalize colors for Display Formats"

See merge request !46

Resolve "Apply same settings as Preview Card in the rest of the Boxes"

See merge request !42

Merge branch '28-event-full-content-pattern-does-not-display-link-field-in-event-page-content-type' into 'dev'

Resolve "Event full content pattern does not display link field in event page content type"

See merge request !38

event_type

content type

Resolve "Mega Menu doesn't work for IE"

Closes #23

See merge request !35

Update development branch with latest stable version

See merge request !34

Release candidate for version 2.5.0

See merge request !32

Merge request for fixing issue with active trail in the 2nd level of menu

See merge request !31

Update dev w/ latest version of master

See merge request !29

Merge v2.4.0 into master

See merge request !28

# Conflicts:
#   CHANGELOG.md
#   cern_components.info.yml

Resolve "Add text-shadow on Preview Cards"

See merge request !26

Adding a new validation to getLanguageMessage(): Check if the translation is published

See merge request !27

Resolve "Change preview-list titles color to match /news"

See merge request !23