Skip to content

ui: Add dividing line between heatmap and feeds in dashboard view #11437

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
Merged
merged 9 commits into from
May 19, 2020
Merged

ui: Add dividing line between heatmap and feeds in dashboard view #11437

merged 9 commits into from
May 19, 2020

Conversation

a1012112796
Copy link
Member

I think it's necessary to add dividing line between heatmap and feeds in dashboard view, or the first items in feed is too near with heatmap which is not a good view.

from:

from

to:

to

@a1012112796
ui: Add dividing line between heatmap and feeds in dashboard view
3ddd8ce 
I think it's necessary to add dividing line between heatmap
and feeds in dashboard view, or the first items in feed is too
near with heatmap which is not a good view.

Signed-off-by: a1012112796 <[email protected]>
@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 May 16, 2020
@lafriks lafriks added this to the 1.12.0 milestone May 16, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 16, 2020
@zeripath
Copy link
Contributor

why not just move the divider to the start of each of the feeds in templates/user/dashboards/feeds?

@lafriks lafriks modified the milestones: 1.12.0, 1.13.0 May 16, 2020
@a1012112796
Copy link
Member Author

why not just move the divider to the start of each of the feeds in templates/user/dashboards/feeds?

good, I didn't thought it. Thanks for your suggestion.

@a1012112796
Copy link
Member Author

@lafriks I wander why move this pr to v1.13? 🤔

@mrsdizzie
Copy link
Member

I think this should already work but there is a bug:

gitea/templates/user/dashboard/heatmap.tmpl

Lines 7 to 8 in 5cf224a

<div class="ui divider"></div>
</div>

The divider should be on the outside of the heatmap div. It should be moved there

@lunny
Copy link
Member

lunny commented May 17, 2020

@a1012112796 Since v1.12 will be rc1. All non-bug PRs should be moved to v1.13.

@a1012112796

This comment has been minimized.

Sign in to view
@mrsdizzie
Copy link
Member

I don't think it looks bad putting a divider line below the heatmap and having a completely empty feed seems pretty rare.

However if you disable heatmap having the divider line on top of feed looks bad because it comes right after another dividing line in the header and then will always look bad.

Also that breaks general behavior of always having the dividing line below the element.

@a1012112796
Copy link
Member Author

@mrsdizzie done

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

ping LG-TM

@techknowlogick techknowlogick merged commit 6ccd19e into go-gitea:master May 19, 2020
@kolaente kolaente mentioned this pull request May 19, 2020
Merged
@CirnoT CirnoT mentioned this pull request May 19, 2020
Closed
@a1012112796 a1012112796 deleted the div_dash branch May 19, 2020 15:53
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@a1012112796 @lafriks @techknowlogick
ui: Add dividing line between heatmap and feeds in dashboard view (go…
ce11547 
…-gitea#11437)

* ui: Add dividing line between heatmap and feeds in dashboard view

I think it's necessary to add dividing line between heatmap
and feeds in dashboard view, or the first items in feed is too
near with heatmap which is not a good view.

Signed-off-by: a1012112796 <[email protected]>

* Change the implementation method

* change style

* restart ci

Co-authored-by: Lauris BH <[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

@lafriks lafriks lafriks approved these changes

@zeripath zeripath zeripath 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.
7 participants
@a1012112796 @zeripath @mrsdizzie @lunny @techknowlogick @lafriks @GiteaBot