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.

Sign up for GitHub

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

Sprint 62 additions to release candidate #810

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Sprint 62 additions to release candidate #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d93ec
VOTE-2173 Hotfix Cypress menu test update
rayestrada Jul 1, 2024
833fe12
VOTE-2201: Hide footer usagov links when not translated (#803)
WilliamYKwon Jul 2, 2024
b66bf99
VOTE-2108 remove font-family declaration on main tag
rayestrada Jul 2, 2024
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
6 changes: 3 additions & 3 deletions testing/cypress/e2e/frontEndTests/menu.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('Check main menu', () => {
})

it('main menu - mobile', () => {
// set viewport to mobile
// set viewport to mobile
cy.viewport('iphone-6')
cy.get('[data-test="mobileBtn"]').click()
cy.get('[data-test="mobileNav"]').should('be.visible')
Expand All @@ -23,8 +23,8 @@ describe('Check main menu', () => {
})
cy.get('[data-test="searchBox"]').should('be.visible')
// close menu
cy.get('[data-test="closeBtn"]').click({force: true})
cy.get('[data-test="mainCloseBtn"]').click()
cy.get('[data-test="mobileNav"]').should('not.be.visible')

})
})
})
4 changes: 0 additions & 4 deletions web/themes/custom/votegov/src/sass/base/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@ hr, p + hr {
border-bottom: 1px solid $bg-light-medium;
}

main {
@include u-font-family('serif');
}

.nonvfont,
.nonvfont * {
@include u-font-family('sans');
Expand Down
2 changes: 1 addition & 1 deletion web/themes/custom/votegov/templates/block/block--votegov-languageswitcher.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</button>

<div class="usa-language__submenu" id="language-options" hidden {{ attributes }}>
<button type="button" class="usa-language__close" data-test="closeBtn">{{ 'Close' | t }}</button>
<button type="button" class="usa-language__close" data-test="langcloseBtn">{{ 'Close' | t }}</button>
{# Language menu items: links--language-block.html.twig #}
<ul data-test="languageSwitcher"
name="language-switcher">
Expand Down
11 changes: 7 additions & 4 deletions web/themes/custom/votegov/templates/component/usagov-partner.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<div class="vote-usagov-partner">
{# USA.gov Links #}
<nav class="vote-usagov-partner__links" aria-label={{ "External election resources" | t }}>
{# USA.gov election info links #}
{{ drupal_entity('block_content', '18') }}
</nav>
{% set usagov_links_block = drupal_entity('block_content', '18') %}
{% if usagov_links_block['#block_content'].langcode.value == language %}
<nav class="vote-usagov-partner__links" aria-label={{ "External election resources" | t }}>
{# USA.gov election info links #}
{{ usagov_links_block }}
</nav>
{% endif %}

{# Row 2 Divider - USA.gov link and email sign-up #}
<div class="vote-usagov-partner__contact-container">
Expand Down
2 changes: 1 addition & 1 deletion web/themes/custom/votegov/templates/navigation/menu--main--votegov-mainnavigation.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ We call a macro which calls itself to render the full tree.
<nav aria-label="{{ 'Primary' | t }}" class="usa-nav" data-test="mainNav">
<div class="usa-nav__inner">
<div class="grid-container usa-nav__close-container">
<button type="button" class="usa-nav__close" data-test="closeBtn">{{ 'Close' | t }}</button>
<button type="button" class="usa-nav__close" data-test="mainCloseBtn">{{ 'Close' | t }}</button>
</div>
{{ menus.menu_links(items, attributes, 0, 'basic-mega-nav-section-') }}
<div class="usa-nav__secondary">
Expand Down