Skip to content

Commit

Permalink
Merge pull request #1047 from Financial-Times/CON-3426-DesignChangesO…
Browse files Browse the repository at this point in the history
…nTopSearchBar

CON-3426: design changes ask button, edition switcher, subscribe button
  • Loading branch information
danieleruiz authored Jul 8, 2024
2 parents edd2b28 + 0e2c980 commit 7b4a8da
Show file tree
Hide file tree
Showing 14 changed files with 763 additions and 626 deletions.
2 changes: 1 addition & 1 deletion examples/ft-ui/__test__/integration.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('examples/ft-ui', () => {
})

it('renders the drawer menu', async () => {
await expect(page).toMatchElement('#o-header-drawer', { text: 'Switch to International Edition' })
await expect(page).toMatchElement('#o-header-drawer', { text: 'International' })
await expect(page).toMatchElement(
'#o-header-drawer',
{ text: 'Top sections' },
Expand Down
2 changes: 1 addition & 1 deletion examples/kitchen-sink/__test__/integration.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('examples/kitchen-sink/integration', () => {
})

it('renders edition with current edition selected', () => {
expect(response.text).toContain('<p class="o-header__drawer-current-edition">International Edition</p>')
expect(response.text).toContain('<span class="o-header__drawer-menu-item o-header__drawer-current-edition">International</span>')
})

it('renders app context data as embedded JSON', () => {
Expand Down
55 changes: 50 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/dotcom-ui-header/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"@svgr/core": "^5.0.0",
"camelcase": "^6.0.0",
"check-engine": "^1.10.1",
"@financial-times/o-header": "^12.0.0"
"@financial-times/o-header": "^13.0.0"
},
"peerDependencies": {
"@financial-times/o-header": "^12.0.0",
"@financial-times/o-header": "^13.0.0",
"@financial-times/logo-images": "^1.10.1",
"react": "17.x || 18.x",
"react-dom": "17.x || 18.x",
Expand Down
Loading

0 comments on commit 7b4a8da

Please sign in to comment.