Can’t choose branch for merge.

[melmus]

• Gitea version (or commit ref):
  1.13.0+dev-295-g16980d13c

• Git version:
  2.17.1

• Operating system:
  Ubuntu 18.04.3 LTS

• Database (use [x]):

  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite

• Can you reproduce the bug at https://try.gitea.io:

  • Yes (provide example URL)
  • No
  • Not relevant

• Log gist:

Description

In the Pull Request if you go to Files Changed and choose “editing”, you can’t choose branch for merge.

List of browsers:

• Google Chrome Version 84.0.4147.105 (Official Build) (64-bit), 84.0.4147.125 (Official Build) (64-bit)
• Opera Version: 70.0.3728.106 (64-bit), 70.0.3728.119 (64-bit)
• Safari Version: 13.1.2 (13609.3.5.1.5) (64-bit), 13.1.2 (15609.3.5.1.3) (64-bit)
• Firefox Version: 79.0 (64-bit)

Screenshots

[jolheiser]

It lost the z-index battle. 😢

Branch selection

vs sticky details

gitea/web_src/less/_repository.less

Line 1582 in 61a1729

z-index: 800;

I'm not sure the best way to fix it other than fighting z-index with a higher z-index, but that feels almost as dirty as an !important battle.
I'm also not sure why the sticky details are at 800. Since we can't really change semantic, the conclusion would be to change the sticky details to <=10, but I'm not sure what else that might break in a z-index battle.

@silverwind @CirnoT Thoughts? You two seem to have a better grasp than I do when it comes to these things.

[silverwind]

I'd say that diff bar should not set a z-index when it's not in the sticky state, avoiding this issue altogether by not creating the stacking context unless necessary.

[CirnoT]

I'd say that diff bar should not set a z-index when it's not in the sticky state

That would require JavaScript hacks which we wanted to avoid.

I'm also not sure why the sticky details are at 800. Since we can't really change semantic, the conclusion would be to change the sticky details to <=10, but I'm not sure what else that might break in a z-index battle.

Quick test shows that it can be safely reduced to 8.