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

YALB-363: Design: Serif text in right column gets cut off | YALB-365: Design: Grand Hero Banner overlay header spacing | YALB-424: Removing primary-nav and grand hero results in missing fontawesome #211

Merged
merged 3 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions atomic.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ core_version_requirement: ^9 || ^10
libraries:
- atomic/global
- atomic/layout-builder
- atomic/fontawesome

ckeditor5-stylesheets:
- css/ckeditor5.css
Expand Down
1 change: 1 addition & 0 deletions css/layout-builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -278,3 +278,4 @@ div[data-drupal-selector="edit-block-form"] {
#block-yalesitesfooterblock {
margin-top: auto;
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block content %}

{{ attach_library('atomic/fontawesome') }}

{% embed "@molecules/banner/grand-hero/yds-grand-hero.twig" with {
grand_hero__heading: content.field_heading,
grand_hero__heading__level: content.field_heading_level.0['#markup'],
grand_hero__snippet: content.field_text,
grand_hero__snippet: content.field_text.0,
grand_hero__link__content: content.field_link.0['#title'],
grand_hero__link__url: content.field_link.0['#url_title'],
grand_hero__content__background: content.field_style_color.0['#markup'],
Expand Down
3 changes: 3 additions & 0 deletions templates/field/field--block-content--text.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% for item in items %}
{{ item.content }}
{% endfor %}
1 change: 0 additions & 1 deletion templates/navigation/menu--extras--main.html.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{# Note: After enabling menu_item_extras module, this file was renamed from menu--main.html.twig #}
{{ attach_library('atomic/primary-nav') }}
{{ attach_library('atomic/fontawesome')}}

{% include "@organisms/menu/primary-nav/yds-primary-nav.twig" with {
menu__variation: getHeaderSetting('header_variation'),
Expand Down