Skip to content

[Backport] Ensure that diff stats can scroll independently of the diff (#8581) #8611

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

Merged
merged 1 commit into from
Oct 21, 2019

Conversation

6543
Copy link
Member

@6543 6543 commented Oct 21, 2019

This PR ensures that once opened the diff stats detail box can be scrolled independently of the diff on the compare page.

Fixes #5532

Details:

  • make diff-detail-box the main container
  • move file diff at the same level as diff-stats
  • make diff-view options sticy again
  • make diff-stats scroll if to mouch
  • rm useless css info
  • less: mv diff-stats to own class
  • use new css class
  • cleanup less file
  • diff-counter: margin-right: 15px;
  • make CI work
  • make numbers colorful
  • add sign (-/+) to numbers

Please check the following:

  1. Make sure you are targeting the master branch, pull requests on release branches are only allowed for bug fixes.
  2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
  3. Describe what your pull request does and which issue you're targeting (if any)

You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.

…#8581)

This PR ensures that once opened the diff stats detail box can be scrolled independently of the diff on the compare page.

Fixes go-gitea#5532 

Details:

* make diff-detail-box the main container
* move file diff at the same level as diff-stats
* make diff-view options sticy again
* make diff-stats scroll if to mouch
* rm useless css info
* less: mv diff-stats to own class
* use new css class
* cleanup less file
* diff-counter: margin-right: 15px;
* make CI work
* make numbers colorful
* add sign (-/+) to numbers
@6543 6543 mentioned this pull request Oct 21, 2019
@6543 6543 changed the title Ensure that diff stats can scroll independently of the diff (#8581) [Backport] Ensure that diff stats can scroll independently of the diff (#8581) Oct 21, 2019
@6543
Copy link
Member Author

6543 commented Oct 21, 2019

@zeripath backport 'point'

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 21, 2019
@zeripath zeripath added type/bug topic/ui Change the appearance of the Gitea UI labels Oct 21, 2019
@zeripath zeripath added this to the 1.10.0 milestone Oct 21, 2019
@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 Oct 21, 2019
@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 Oct 21, 2019
@lunny lunny merged commit cf35355 into go-gitea:release/v1.10 Oct 21, 2019
@6543 6543 deleted the backports_8581 branch October 28, 2019 22:57
@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.
Labels
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 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants