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

Fix sticky diff header background #27697

Merged
merged 2 commits into from
Oct 20, 2023
Merged

Fix sticky diff header background #27697

merged 2 commits into from
Oct 20, 2023

Conversation

silverwind
Copy link
Member

Fixes: #27604

Add negative margins so the header covers any shadow of active elements. No rendering change of the content of the header because the padding counteracts the effect.

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 19, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 19, 2023
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Oct 19, 2023
@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 20, 2023
@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 20, 2023
@6543 6543 enabled auto-merge (squash) October 20, 2023 14:49
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 20, 2023
@6543 6543 merged commit 4539a7b into go-gitea:main Oct 20, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Oct 20, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 20, 2023
Fixes: go-gitea#27604

Add negative margins so the header covers any shadow of active elements.
No rendering change of the content of the header because the padding
counteracts the effect.

<img width="128" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3d0f55b6-9351-4985-a290-da9a92d15b4e">
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Oct 20, 2023
@silverwind silverwind deleted the stickymargin branch October 20, 2023 15:44
silverwind added a commit that referenced this pull request Oct 20, 2023
Backport #27697 by @silverwind

Fixes: #27604

Add negative margins so the header covers any shadow of active elements.
No rendering change of the content of the header because the padding
counteracts the effect.

<img width="128" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3d0f55b6-9351-4985-a290-da9a92d15b4e">

Co-authored-by: silverwind <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 23, 2023
* upstream/main:
  Fix incorrect ctx usage in defer function (go-gitea#27740)
  Enable followCursor for language stats bar (go-gitea#27713)
  teams: new View button (go-gitea#27685)
  fix issues in translation file (go-gitea#27699)
  Fix an indentation in the Chinese documentation of Act Runner (go-gitea#27730)
  [skip ci] Updated translations via Crowdin
  Fix org team endpoint (go-gitea#27721)
  Improve diff tree spacing (go-gitea#27714)
  refactor: make db iterate context aware (go-gitea#27710)
  [FIX] resolve confusing colors in languages stats by insert a gap (go-gitea#27704)
  Fix sticky diff header background (go-gitea#27697)
  Replace -1 with GhostUserID (go-gitea#27703)
  Clean some functions about project issue (go-gitea#27705)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Visual highlight glitch
4 participants