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

fix(images): add favicon and brand image (backport #280) #290

Merged
merged 2 commits into from
Sep 17, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 17, 2021

This is an automatic backport of pull request #280 done by Mergify.
Cherry-pick of 4f42251 has failed:

On branch mergify/bp/v2/pr-280
Your branch is up to date with 'origin/v2'.

You are currently cherry-picking commit 4f42251.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   license-config.json
	modified:   src/app/app.css
	new file:   src/app/assets/cryostat-3-icon-16px.png
	new file:   src/app/assets/icon-cryostat-3-white.svg
	new file:   src/app/assets/icon-cryostat-3.svg
	new file:   src/app/assets/logo-cryostat-3-horizontal.svg
	new file:   src/app/assets/logo-cryostat-3.svg
	modified:   src/index.html
	modified:   webpack.common.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/app/AppLayout/AppLayout.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* fix(images): add favicon and brand image

* fix(license): don't expect license in images

* Update assets

* Use logo variant

* Update logo and use horizontal variant in masthead

* Remove unused asset

(cherry picked from commit 4f42251)

# Conflicts:
#	src/app/AppLayout/AppLayout.tsx
@andrewazores andrewazores merged commit f485352 into v2 Sep 17, 2021
@mergify mergify bot deleted the mergify/bp/v2/pr-280 branch September 17, 2021 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant