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 styling for commiter on diff view #11715

Merged
merged 6 commits into from
Jun 3, 2020
Merged

Fix styling for commiter on diff view #11715

merged 6 commits into from
Jun 3, 2020

Conversation

CirnoT
Copy link
Contributor

@CirnoT CirnoT commented May 31, 2020

I've tried adjusting width here already in #11441 but it turns out that it doesn't look so well when there are multiple parents (see image on #11709)

chrome_2020-05-31_23-45-46
chrome_2020-05-31_23-52-02

@lunny lunny added the topic/ui Change the appearance of the Gitea UI label Jun 1, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 1, 2020
@zeripath zeripath added this to the 1.13.0 milestone Jun 1, 2020
@silverwind
Copy link
Member

silverwind commented Jun 2, 2020 •
edited

I'd probably remove the commit icon and do:

User1 authored 25 minutes ago
User2 committed 25 minutes ago

GitHub combines these as one message, but I think that approach can be confusing because it's not immediately clear who authored and who commited (IIRC, author should be first):

User1 and User2 committed 25 minutes ago

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 2, 2020

The whole point of splitting the message is to make is shorter, for long emails or names the message easily goes into second line and I'd like to avoid it as it looks weird when only part of '2 days ago' is in a second line.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 2, 2020

Also duplicating time on committed user looks weird as hell

@silverwind
Copy link
Member

Right, date duplication is weird. Maybe follow what GitHub does.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 2, 2020 •
edited

That would make message even longer, making them problem even more evident and annoying.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 2, 2020

GitHub can do it for two reasons:

  • They don't show user email at all, we do.
  • They can stack away avatars nicely, we can't.

@silverwind
Copy link
Member

If space is scarce, maybe we should move the e-mail to a title attribute but I guess such a change needs to be done on more places.

@CirnoT
Copy link
Contributor Author

CirnoT commented Jun 2, 2020

Also given how our default trust model for signing works, I find it useful to have it obvious who committed and who authored.

silverwind
silverwind approved these changes Jun 2, 2020
View reviewed changes
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

Guess more improvements can be done later.

@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 2, 2020
@techknowlogick
Copy link
Member

ping LG-TM

@techknowlogick techknowlogick merged commit 8e035f8 into go-gitea:master Jun 3, 2020
@techknowlogick
Copy link
Member

@CirnoT please send backport :)

@CirnoT CirnoT deleted the 11441-fix branch June 3, 2020 05:52
CirnoT added a commit to CirnoT/gitea that referenced this pull request Jun 3, 2020
@CirnoT
Fix styling for commiter on diff view (go-gitea#11715)
04124f2 
* Fix styling for commiter on diff view

* Update options/locale/locale_en-US.ini

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Apply suggestions from code review

Co-authored-by: silverwind <[email protected]>

Co-authored-by: silverwind <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
(cherry picked from commit 8e035f8)
@CirnoT CirnoT mentioned this pull request Jun 3, 2020
Merged
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Jun 3, 2020
zeripath pushed a commit that referenced this pull request Jun 3, 2020
@CirnoT
Fix styling for commiter on diff view (#11715) (#11744)
f428d40 
* Fix styling for commiter on diff view

* Update options/locale/locale_en-US.ini

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Apply suggestions from code review

Co-authored-by: silverwind <[email protected]>

Co-authored-by: silverwind <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
(cherry picked from commit 8e035f8)
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@CirnoT @silverwind @techknowlogick
Fix styling for commiter on diff view (go-gitea#11715)
e8c633f 
* Fix styling for commiter on diff view

* Update options/locale/locale_en-US.ini

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <[email protected]>

* Apply suggestions from code review

Co-authored-by: silverwind <[email protected]>

Co-authored-by: silverwind <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
@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

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. 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.

None yet
6 participants
@CirnoT @silverwind @techknowlogick @zeripath @lunny @GiteaBot