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

Merge release-0.8 back into main #689

Merged
merged 9 commits into from
Feb 28, 2022
7 changes: 6 additions & 1 deletion ui/packages/app/web/src/components/CompareButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ const CompareButton = ({disabled, onClick}: {disabled: boolean; onClick: () => v
Compare
</Button>
{compareHover && (
<div ref={setComparePopperElement} style={styles.popper} {...attributes.popper}>
<div
ref={setComparePopperElement}
style={styles.popper}
{...attributes.popper}
className="z-50"
>
<div className="flex">
<div className="relative mx-2">
<svg className="text-black h-1 w-full left-0" x="0px" y="0px" viewBox="0 0 255 127.5">
Expand Down
1 change: 1 addition & 0 deletions ui/packages/app/web/src/components/MatchersInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ const MatchersInput = ({
ref={setPopperElement}
style={{...styles.popper, marginLeft: 0}}
{...attributes.popper}
className="z-50"
>
<Transition
show={focusedInput && showSuggest}
Expand Down
7 changes: 6 additions & 1 deletion ui/packages/app/web/src/components/MergeButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ const MergeButton = ({disabled, onClick}: {disabled: boolean; onClick: () => voi
Merge
</Button>
{mergeHover && (
<div ref={setMergePopperElement} style={styles.popper} {...attributes.popper}>
<div
ref={setMergePopperElement}
style={styles.popper}
{...attributes.popper}
className="z-50"
>
<div className="flex">
<div className="relative mx-2">
<svg className="text-black h-1 w-full left-0" x="0px" y="0px" viewBox="0 0 255 127.5">
Expand Down