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

z-index issues #1430

Merged
merged 1 commit into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ const HeaderContainer = styled.header`
width: 100%;
position: fixed;
top: 0;
z-index: 99999;
z-index: 999;
`;

const ParentContainer = styled.div`
Expand Down
2 changes: 2 additions & 0 deletions src/components/chat/w2wChat/searchBar/SearchBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ const SearchBar = ({ autofilled, searchedUser, setSearchedUser }) => {
height="48px"
top="10px"
right="0px"
zIndex="1"
>
<ButtonV2
alignSelf="stretch"
Expand All @@ -181,6 +182,7 @@ const SearchBar = ({ autofilled, searchedUser, setSearchedUser }) => {
borderRadius="50%"
onClick={() => setActiveTab(3)}
>

<AddIcon style={{ color: '#FFFFFF', fontSize: '24px', cursor: 'pointer' }} />
</ButtonV2>
</ItemVV2>
Expand Down
6 changes: 5 additions & 1 deletion src/sections/chat/ChatSidebarSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ const ChatSidebarSection = ({ showCreateGroupModal, autofilledSearch }) => {
hoverBackground="transparent"
color={theme.default.color}
flex="1"
zIndex="1"
padding="10px 10px 20px 10px"
onClick={() => {
setActiveTab(0);
Expand All @@ -168,6 +169,7 @@ const ChatSidebarSection = ({ showCreateGroupModal, autofilledSearch }) => {
background="transparent"
hoverBackground="transparent"
color={theme.default.color}
zIndex="1"
flex="1"
padding="10px 10px 20px 10px"
onClick={() => {
Expand Down Expand Up @@ -228,13 +230,15 @@ const ChatSidebarSection = ({ showCreateGroupModal, autofilledSearch }) => {
autofilled={undefined}
searchedUser={searchedUser}
setSearchedUser={setSearchedUser}

/>
)}
{activeTab == 0 && (
<CreateGroupContainer
// justifyContent="flex-start"
flex="none"
padding="20px 10px 24px 10px"
zIndex="1"
borderRadius={GLOBALS.ADJUSTMENTS.RADIUS.MID}
onClick={handleCreateGroup}
background="transparent"
Expand Down Expand Up @@ -351,7 +355,7 @@ const ChatSidebarSection = ({ showCreateGroupModal, autofilledSearch }) => {
</QRCodeContainer>
) : null}

<ProfileContainer zIndex='10' borderTop={`1px solid ${theme.default.secondaryBg}`}>
<ProfileContainer zIndex='1' borderTop={`1px solid ${theme.default.secondaryBg}`}>
{/* <ProfileHeader
setActiveTab={setActiveTab}
setShowQR={setShowQR}
Expand Down
2 changes: 1 addition & 1 deletion src/structure/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ function Navigation() {
}}
placementProps={{
width: 'fit-content',
zIndex: '100',
zIndex: '1',
position: 'fixed',
bottom: sidebarCollapsed ? '7px' : '1rem',
left: sidebarCollapsed ? '6rem' : '16rem',
Expand Down
Loading