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

Jump to bottom

Fix repo internal icon when avatar is present #11873

Merged
merged 3 commits into from
Jun 12, 2020
Merged

Fix repo internal icon when avatar is present #11873

merged 3 commits into from
Jun 12, 2020

Conversation

CirnoT
Copy link
Contributor

@CirnoT CirnoT commented Jun 12, 2020

I didn't realize we have icon code duplicated to show it after repo name when avatar is present, always assumed that icon just won't show at all.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 12, 2020

Since #11529

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 12, 2020
@silverwind
Copy link
Member

Mixed tabs and spaces.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 12, 2020

Again? Our .editorconfig must be missing something, GoLand says its using it.

@silverwind
Copy link
Member

duplicated

Can you move the duplicated part to a sub-template file so the error does not happen again?

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 12, 2020

Done

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 12, 2020
@lafriks lafriks added topic/ui Change the appearance of the Gitea UI skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jun 12, 2020
@lafriks lafriks added this to the 1.13.0 milestone Jun 12, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 12, 2020
@lafriks lafriks merged commit b6adf80 into go-gitea:master Jun 12, 2020
@CirnoT CirnoT deleted the internal-repo_av branch June 12, 2020 21:24
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@CirnoT
Fix repo internal icon when avatar is present (go-gitea#11873)
c3c7a9c 
* Fix repo internal icon when avatar is present

* fix tabs

* move repo icons in header to separate template
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.
4 participants
@CirnoT @silverwind @lafriks @GiteaBot