Skip to content

Commit cd650ec

Browse files
committed
fix(web): overlay issue
1 parent 32b0d09 commit cd650ec

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

web/src/components/Popup/MiniGuides/MainStructureTemplate.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ const Template: React.FC<ITemplate> = ({
159159
});
160160

161161
return (
162-
<>
163-
<Overlay />
162+
<Overlay>
164163
<Container ref={containerRef} isVisible={isVisible}>
165164
<LeftContainer>
166165
<LeftContainerHeader>
@@ -187,7 +186,7 @@ const Template: React.FC<ITemplate> = ({
187186
</LeftContainer>
188187
<RightContainer>{RightContent}</RightContainer>
189188
</Container>
190-
</>
189+
</Overlay>
191190
);
192191
};
193192

web/src/components/Popup/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ const Popup: React.FC<PopupProps & IPopup> = ({
237237
}
238238

239239
return (
240-
<>
241-
<Overlay />
240+
<Overlay>
242241
<Container ref={containerRef}>
243242
{popupType === PopupType.SWAP_SUCCESS && (
244243
<SVGContainer>
@@ -270,7 +269,7 @@ const Popup: React.FC<PopupProps & IPopup> = ({
270269
/>
271270
)}
272271
</Container>
273-
</>
272+
</Overlay>
274273
);
275274
};
276275
export default Popup;

web/src/layout/Header/DesktopHeader.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { responsiveSize } from "styles/responsiveSize";
1313

1414
import ConnectWallet from "components/ConnectWallet";
1515
import LightButton from "components/LightButton";
16-
import { Overlay } from "components/Overlay";
1716
import Onboarding from "components/Popup/MiniGuides/Onboarding";
1817

1918
import Logo from "./Logo";
@@ -95,7 +94,8 @@ const PopupContainer = styled.div`
9594
left: 0;
9695
width: 100%;
9796
height: 100%;
98-
z-index: 30;
97+
z-index: 1;
98+
background-color: ${({ theme }) => theme.blackLowOpacity};
9999
`;
100100

101101
const DesktopHeader: React.FC = () => {
@@ -149,7 +149,6 @@ const DesktopHeader: React.FC = () => {
149149
</Container>
150150
{(isDappListOpen || isHelpOpen || isSettingsOpen) && (
151151
<PopupContainer>
152-
<Overlay />
153152
{isDappListOpen && <DappList {...{ toggleIsDappListOpen, isDappListOpen }} />}
154153
{isHelpOpen && <Help {...{ toggleIsHelpOpen, isHelpOpen }} />}
155154
{isSettingsOpen && <Settings {...{ toggleIsSettingsOpen, isSettingsOpen, initialTab }} />}

web/src/layout/Header/navbar/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ const PopupContainer = styled.div`
7777
left: 0;
7878
width: 100%;
7979
height: 100%;
80-
z-index: 30;
80+
z-index: 1;
81+
background-color: ${({ theme }) => theme.blackLowOpacity};
8182
`;
8283

8384
export interface ISettings {
@@ -131,7 +132,6 @@ const NavBar: React.FC = () => {
131132
</Wrapper>
132133
{(isDappListOpen || isHelpOpen || isSettingsOpen) && (
133134
<PopupContainer>
134-
<Overlay />
135135
{isDappListOpen && <DappList {...{ toggleIsDappListOpen }} />}
136136
{isHelpOpen && <Help {...{ toggleIsHelpOpen }} />}
137137
{isSettingsOpen && <Settings {...{ toggleIsSettingsOpen }} />}

0 commit comments

Comments
 (0)