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

Added logo #5150

Closed
wants to merge 1 commit into from
Closed

Added logo #5150

wants to merge 1 commit into from

Conversation

tend2infinity
Copy link
Contributor

Signed-off-by: soumya somu12.ss@gmail.com

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Issue #5121

Changes

Added logo

Verification

Tested locally

UI Screenshot

Screenshot from 2022-02-13 20-37-14

squat
squat previously approved these changes Feb 13, 2022
Copy link
Member

@squat squat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:)

@@ -104,6 +104,7 @@ const Navigation: FC<PathPrefixProps & NavigationProps> = ({ pathPrefix, thanosC
<Navbar className="mb-3" dark color="dark" expand="md" fixed="top">
<NavbarToggler onClick={toggle} className="mr-2" />
<Link className="navbar-brand" to={`${pathPrefix}${defaultRoute}`}>
<img src="https://thanos.io/icon-dark.png" alt="thanos" style={{ width: '2rem', marginRight: '0.5rem' }} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it would be interesting to have it locally. Otherwise server that doesn't have access to internet won't be able to display the logo :/

Copy link
Contributor

@Nexucis Nexucis Feb 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case it can help, this is how we did it in Prometheus : prometheus/prometheus#10236

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @Nexucis looks alright?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you run the command make assets at the root of the project ? And then commit the modification of the files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already did that, there isn't any modification apart from what I committed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after running make assets :

git status
On branch logo
Your branch is up to date with 'origin/logo'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   pkg/ui/bindata.go

no changes added to commit (use "git add" and/or "git commit -a")

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you didn't push every changes

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

excepting the asset issue, it looks good to me. I'm just wondering if it would be cleaner to put the style in a dedicated css class.
@onprem any thought around this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you didn't push every changes

Do you want me to add the bindata.go file as well, it had a lot of changes that's why I didn't add it!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes that's exactly what you have to do

@metalmatze
Copy link
Contributor

Love it!
One last run with make docs might fix the last broken CI.

@Nexucis
Copy link
Contributor

Nexucis commented Feb 17, 2022

Soooo after talking a bit with @matej-g, it appears that the issue regarding the doc is tracked with #4732 and there is a short fix with #5167.

So I would suggest that you revert the changes related to the doc @tend2infinity in this PR. Hopefully once #5167 is merged, the CI in this PR will be green.

@Nexucis
Copy link
Contributor

Nexucis commented Feb 24, 2022

you still have to run make assets and commit the file changed @tend2infinity ;)

Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@Nexucis
Copy link
Contributor

Nexucis commented Feb 24, 2022

cool, now we are good @tend2infinity, thanks !

back to you guys @kakkoyun @metalmatze :)

@Nexucis
Copy link
Contributor

Nexucis commented Feb 24, 2022

ah no wait, you have some conflict @tend2infinity. Probably better to rebase the PR with the last changes from the main branch and then re-run make assets

@tend2infinity
Copy link
Contributor Author

ah no wait, you have some conflict @tend2infinity. Probably better to rebase the PR with the last changes from the main branch and then re-run make assets

Yup, I rebased, I feel now we should be good to go

@Nexucis
Copy link
Contributor

Nexucis commented Feb 24, 2022

It looks like the file bind_data.go isn't well generated or formated. Did you get an error when running the command @tend2infinity ?

@tend2infinity
Copy link
Contributor Author

Seems like docs are failing for almost all of my PRs 👀

@squat
Copy link
Member

squat commented Feb 26, 2022

@tend2infinity could you rebase on main? Docs are building correctly there and there were done changes recently

@bwplotka
Copy link
Member

bwplotka commented Apr 7, 2022

Friendly ping (:

@Nexucis
Copy link
Contributor

Nexucis commented Apr 23, 2022

@tend2infinity if you are not available anymore, I could take back your PR and rebase it if you want, so we can merge it :).

@tend2infinity
Copy link
Contributor Author

Hey @Nexucis really sorry couldn't catch up, actually have my exams right now, will update this as soon as I get time

@adithyaakrishna
Copy link

@tend2infinity Can I take this up? 👀

@Nexucis
Copy link
Contributor

Nexucis commented Jun 7, 2022

any chance you have some time to rebase this PR @tend2infinity ?

@tend2infinity
Copy link
Contributor Author

Its been a while since I looked upon this issue and right now um facing a lot of conflicts while rebasing the branch, maybe we can close this issue and open a clone of this and make the same changes in a new branch

@Nexucis
Copy link
Contributor

Nexucis commented Jun 19, 2022

if it's too hard to rebase, maybe you could simply merge the main branch in yours.

And if the conflicts are still too hard to resolve, another way around to do it, is to erase your local branch with the last commit from the main branch. And then copy and past the changes you can find in this PR. Commit your changes, and force push. So it doesn't change the branch and so the PR.

Signed-off-by: tend2infinity <somu12.ss@gmail.com>
@tend2infinity
Copy link
Contributor Author

if it's too hard to rebase, maybe you could simply merge the main branch in yours.

And if the conflicts are still too hard to resolve, another way around to do it, is to erase your local branch with the last commit from the main branch. And then copy and past the changes you can find in this PR. Commit your changes, and force push. So it doesn't change the branch and so the PR.

Done exactly the same, I guess it must be fixed now

Copy link
Contributor

@Nexucis Nexucis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tend2infinity.
It looks good to me :).

@Nexucis
Copy link
Contributor

Nexucis commented Jun 20, 2022

if someone from the thanos team can rerun the github action, it will hopefully work :). And then probably it will be the good time to merge if you are agree too ;)

@stale
Copy link

stale bot commented Sep 21, 2022

Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale bot added the stale label Sep 21, 2022
@Nexucis
Copy link
Contributor

Nexucis commented Sep 22, 2022

yes it is still relevant, but I have no idea why it has not been merged. Perhaps there was still a blocking point

@stale stale bot removed the stale label Sep 22, 2022
Copy link
Member

@squat squat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tend2infinity could you regenerate the bindata file? After that we can merge 🚢

@stale
Copy link

stale bot commented Oct 30, 2022

Hello 👋 Looks like there was no activity on this amazing PR for the last 30 days.
Do you mind updating us on the status? Is there anything we can help with? If you plan to still work on it, just comment on this PR or push a commit. Thanks! 🤗
If there will be no activity in the next week, this issue will be closed (we can always reopen a PR if you get back to this!). Alternatively, use remind command if you wish to be reminded at some point in future.

@stale stale bot added the stale label Oct 30, 2022
@yeya24
Copy link
Contributor

yeya24 commented Oct 30, 2022

Hi @tend2infinity, are you still planning to finish this pr? If not, I am happy to help resolve the merge conflict and get this in!

@stale stale bot removed the stale label Oct 30, 2022
@stale
Copy link

stale bot commented Jan 7, 2023

Hello 👋 Looks like there was no activity on this amazing PR for the last 30 days.
Do you mind updating us on the status? Is there anything we can help with? If you plan to still work on it, just comment on this PR or push a commit. Thanks! 🤗
If there will be no activity in the next week, this issue will be closed (we can always reopen a PR if you get back to this!). Alternatively, use remind command if you wish to be reminded at some point in future.

@stale stale bot added the stale label Jan 7, 2023
@Nexucis
Copy link
Contributor

Nexucis commented Apr 12, 2023

this PR can be closed as the logo has been added thanks to the PR #6264 :)

@stale stale bot removed the stale label Apr 12, 2023
@matej-g matej-g closed this Apr 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants