Merge branch 'stable-3.10'
* stable-3.10:
Fix Attach AI fixes on Save Button click
gr-rest-api-impl: Remove duplicate base url from _fetchB64File
Fix code comment position with Firefox
Unmark updateCheckTimerHandle as state()
Add support for using diff3 for rebasing and cherry-pick with conflicts
Use constant time comparison
Release-Notes: skip
Change-Id: Ie60a838d7704daee2195a29f43cc2ed3c3b1e91a
diff --git a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-styles.ts b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-styles.ts
index 8b333e6..1de8298 100644
--- a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-styles.ts
+++ b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-styles.ts
@@ -75,6 +75,8 @@
gr-diff-element {
/* for gr-selection-action-box positioning */
position: relative;
+ /* Firefox requires a block to position child elements absolutely */
+ display: block;
}
gr-diff-element gr-selection-action-box {
/* Needs z-index to appear above wrapped content, since it's inserted