Skip to content

Commit

Permalink
feat: add post divider, remove vertical divider (#2212)
Browse files Browse the repository at this point in the history
* feat: add post borders back

* feat: get rid of divider

* feat: remove vertical divider
  • Loading branch information
colbr authored Aug 28, 2024
1 parent e705185 commit fb9db5d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
5 changes: 5 additions & 0 deletions src/apps/messenger/Main.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.Split {
display: flex;
width: 100%;
gap: 8px;
}
12 changes: 8 additions & 4 deletions src/apps/messenger/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { MessengerFeed } from '../../components/messenger/feed';
import { DevPanelContainer } from '../../components/dev-panel/container';
import { FeatureFlag } from '../../components/feature-flag';

import styles from './Main.module.scss';

export interface Properties {
context: {
isAuthenticated: boolean;
Expand All @@ -31,11 +33,13 @@ export class Container extends React.Component<Properties> {
<>
<Sidekick />

<FeatureFlag featureFlag='enableChannels'>
<MessengerFeed />
</FeatureFlag>
<div className={styles.Split}>
<FeatureFlag featureFlag='enableChannels'>
<MessengerFeed />
</FeatureFlag>

<MessengerChat />
<MessengerChat />
</div>
<Sidekick variant='secondary' />

<FeatureFlag featureFlag='enableDevPanel'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@

> li {
padding: 16px 8px;

border-top: 1px solid rgba(245, 245, 245, 0.12);
}
}
26 changes: 11 additions & 15 deletions src/components/messenger/feed/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,17 @@ export class Container extends React.Component<Properties> {
}

return (
<>
<div {...cn('')}>
<ScrollbarContainer variant='on-hover'>
<CreatePost
avatarUrl={this.props.user.data?.profileSummary.profileImage}
onSubmit={this.submitPost}
isSubmitting={this.isSubmitting}
/>

<FeedViewContainer channelId={activeConversationId} />
</ScrollbarContainer>
</div>

<div {...cn('divider')} />
</>
<div {...cn('')}>
<ScrollbarContainer variant='on-hover'>
<CreatePost
avatarUrl={this.props.user.data?.profileSummary.profileImage}
onSubmit={this.submitPost}
isSubmitting={this.isSubmitting}
/>

<FeedViewContainer channelId={activeConversationId} />
</ScrollbarContainer>
</div>
);
}
}
Expand Down

0 comments on commit fb9db5d

Please sign in to comment.