Skip to content

[7.8] Fix branding (#64712)#68030

Merged
ryankeairns merged 4 commits intoelastic:7.8from
ryankeairns:backport/7.8/pr-64712
Jun 3, 2020
Merged

[7.8] Fix branding (#64712)#68030
ryankeairns merged 4 commits intoelastic:7.8from
ryankeairns:backport/7.8/pr-64712

Conversation

@ryankeairns
Copy link
Contributor

@ryankeairns ryankeairns commented Jun 2, 2020

Fixes #68000

Backports the following commits to 7.8:

* branding updates

* update snapshots

* update loginPage snapshot

* removed unused EuiText imports

* update button label for exiting full screen

* remove unused translations

* update loading_news snapshot

* update functional baseline screenshots
# Conflicts:
#	src/core/public/chrome/ui/header/header_logo.tsx
#	x-pack/plugins/translations/translations/zh-CN.json
@ryankeairns ryankeairns added the backport This PR is a backport of another PR label Jun 2, 2020
@alexfrancoeur alexfrancoeur changed the title [7.8] Additional branding updates (#64712) [7.8] Fix branding (#64712) Jun 2, 2020
@ryankeairns
Copy link
Contributor Author

ryankeairns commented Jun 3, 2020

@myasonik I need your help sorting this out in the morning.

I updated some snapshots, but I'm not sure that was the right thing to do. If it was, then it seems there might be more to update... but its not clear to me why I would need to update them. Something feels 'off' and I want to be sure I'm following your recent header test changes.

I think I need to do something like:

  1. merge upstream (to pick up your new header tests)
  2. re-fix my conflicts (related to changing the logo in the header & removing a CN translation)
  3. update snapshots related to said conflicts
  4. push up changes

@ryankeairns
Copy link
Contributor Author

@elasticmachine merge upstream

@ryankeairns
Copy link
Contributor Author

The failing tests passed locally, so re-running it here.

@ryankeairns ryankeairns linked an issue Jun 3, 2020 that may be closed by this pull request
@ryankeairns ryankeairns force-pushed the backport/7.8/pr-64712 branch from 0accf56 to 5609dca Compare June 3, 2020 15:01
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@ryankeairns ryankeairns merged commit 4035283 into elastic:7.8 Jun 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix branding updates missing in 7.8 BCs

2 participants