fix: address PR reviews

pull/2410/head
Audric Ackermann 3 years ago
parent b9cccfc2a8
commit 6f0d223eb9

@ -204,7 +204,6 @@ $session-subtle-factor: 0.6;
// Default Components // Default Components
$main-view-header-height: 63px; $main-view-header-height: 63px;
$session-left-pane-width: 300px;
// Various Components // Various Components
$session-modal-size-sm: 220px; $session-modal-size-sm: 220px;

@ -71,7 +71,7 @@ $session-compose-margin: 20px;
} }
.module-left-pane { .module-left-pane {
width: $session-left-pane-width; width: var(--left-pane-list-width);
position: relative; position: relative;
height: 100vh; height: 100vh;
flex-shrink: 0; flex-shrink: 0;

@ -162,7 +162,7 @@
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
color: rgba(var(--color-text), 0.6); color: rgba(black, 0.6);
transition: $session-transition-duration; transition: $session-transition-duration;
&:visited &:link { &:visited &:link {
@ -179,7 +179,7 @@
padding-top: 0; padding-top: 0;
padding-bottom: 20px; padding-bottom: 20px;
color: rgba(var(--color-text), 0.6); color: rgba(black, 0.6);
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;

@ -24,26 +24,23 @@ const StyledSessionMemberItem = styled.button<{
selected?: boolean; selected?: boolean;
}>` }>`
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
justify-content: space-between;
flex-shrink: 0; flex-shrink: 0;
flex-grow: 1; flex-grow: 1;
font-family: var(--font-default); font-family: var(--font-default);
padding: 0px var(--margins-sm); padding: 0px var(--margins-sm);
height: ${props => (props.inMentions ? '40px' : '50px')}; height: ${props => (props.inMentions ? '40px' : '50px')};
display: flex;
align-items: center;
justify-content: space-between;
transition: var(--default-duration); transition: var(--default-duration);
opacity: ${props => (props.zombie ? 0.5 : 1)}; opacity: ${props => (props.zombie ? 0.5 : 1)};
background-color: ${props =>
props.selected && 'var(--color-conversation-item-selected) !important'};
:not(:last-child) { :not(:last-child) {
border-bottom: var(--border-session); border-bottom: var(--border-session);
} }
background-color: ${props =>
props.selected ? 'var(--color-conversation-item-selected) !important' : null};
`; `;
const StyledInfo = styled.div` const StyledInfo = styled.div`
@ -110,7 +107,6 @@ export const MemberListItem = (props: {
> >
<StyledInfo> <StyledInfo>
<AvatarItem memberPubkey={pubkey} isAdmin={isAdmin || false} /> <AvatarItem memberPubkey={pubkey} isAdmin={isAdmin || false} />
<StyledName>{memberName}</StyledName> <StyledName>{memberName}</StyledName>
</StyledInfo> </StyledInfo>

@ -11,7 +11,6 @@ type PillContainerProps = {
export const StyledPillContainerHoverable = styled.div<PillContainerProps>` export const StyledPillContainerHoverable = styled.div<PillContainerProps>`
background: none; background: none;
position: relative; position: relative;
flex-direction: 'row'; flex-direction: 'row';
flex-shrink: 0; flex-shrink: 0;

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { CSSProperties } from 'styled-components';
import { SectionType } from '../../state/ducks/section'; import { SectionType } from '../../state/ducks/section';
import { SessionTheme } from '../../state/ducks/SessionTheme'; import { SessionTheme } from '../../state/ducks/SessionTheme';
import { getLeftPaneLists } from '../../state/selectors/conversations'; import { getLeftPaneLists } from '../../state/selectors/conversations';
@ -45,13 +46,18 @@ const LeftPaneSection = () => {
return null; return null;
}; };
export const leftPaneListWidth = 300;
export const LeftPane = () => { export const LeftPane = () => {
return ( return (
<SessionTheme> <SessionTheme>
<div className="module-left-pane-session"> <div className="module-left-pane-session">
<ActionsPanel /> <ActionsPanel />
<div className="module-left-pane"> <div
className="module-left-pane"
style={{ '--left-pane-list-width': `${leftPaneListWidth}px` } as CSSProperties}
>
<LeftPaneSection /> <LeftPaneSection />
</div> </div>
</div> </div>

@ -53,7 +53,7 @@ export const OverlayMessage = () => {
ConversationTypeEnum.PRIVATE ConversationTypeEnum.PRIVATE
); );
// we now want to show a conversation we just started on the leftpane, even if we did not sent a message to it yet // we now want to show a conversation we just started on the leftpane, even if we did not send a message to it yet
if (!convo.isActive() || !convo.isApproved()) { if (!convo.isActive() || !convo.isApproved()) {
convo.set({ active_at: Date.now(), isApproved: true }); convo.set({ active_at: Date.now(), isApproved: true });
await convo.commit(); await convo.commit();

@ -8,6 +8,7 @@ import {
getDirectContactsByName, getDirectContactsByName,
getDirectContactsCount, getDirectContactsCount,
} from '../../../../state/selectors/conversations'; } from '../../../../state/selectors/conversations';
import { leftPaneListWidth } from '../../LeftPane';
import { StyledLeftPaneList } from '../../LeftPaneList'; import { StyledLeftPaneList } from '../../LeftPaneList';
import { ContactRow, ContactRowBreak } from './ContactRow'; import { ContactRow, ContactRowBreak } from './ContactRow';
import { StyledChooseActionTitle } from './OverlayChooseAction'; import { StyledChooseActionTitle } from './OverlayChooseAction';
@ -97,7 +98,7 @@ const ContactListItemSection = () => {
} }
directContactsByNameWithBreaks={directContactsByNameWithBreaks} directContactsByNameWithBreaks={directContactsByNameWithBreaks}
rowRenderer={renderRow} rowRenderer={renderRow}
width={300} // the same as session-left-pane-width width={leftPaneListWidth}
autoHeight={false} autoHeight={false}
/> />
); );

Loading…
Cancel
Save