Skip to content

Commit

Permalink
Move conversation padding to internal components to allow for better …
Browse files Browse the repository at this point in the history
…scrollbar positioning (#500)
  • Loading branch information
dalefukami authored Apr 12, 2023
1 parent 50313c1 commit a1fa298
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
5 changes: 5 additions & 0 deletions src/components/messenger/autocomplete-members/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
display: flex;
flex-direction: column;

& > * {
padding-right: 16px;
padding-left: 16px;
}

&__search-input {
width: 100%;
}
Expand Down
8 changes: 5 additions & 3 deletions src/components/messenger/list/group-details-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ export class GroupDetailsPanel extends React.Component<Properties, State> {
<SelectedUserTag userOption={u} key={u.value}></SelectedUserTag>
))}
</div>
<Button onPress={this.createGroup} className={c('create')} isLoading={this.props.isCreating}>
Create Group
</Button>
<div>
<Button onPress={this.createGroup} className={c('create')} isLoading={this.props.isCreating}>
Create Group
</Button>
</div>
</div>
);
}
Expand Down
14 changes: 12 additions & 2 deletions src/components/messenger/list/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
}
}

$side-padding: 16px;

.direct-message-members {
flex-grow: 99;
padding: 0 16px;
display: flex;
flex-direction: column;

Expand Down Expand Up @@ -53,6 +54,7 @@

&-conversations-input {
margin-bottom: 18px;
padding: 0px $side-padding;
}
}

Expand All @@ -62,6 +64,7 @@
height: 1px;

overflow: auto;
padding: 0px $side-padding;
}
}
}
Expand All @@ -70,6 +73,7 @@
font-size: 16px;
font-weight: 700;
line-height: 14px;
padding: 0px $side-padding;
color: themeDeprecated.$font-color-primary;
background-color: transparent;
transition: background-color animation.$animation-duration ease-out;
Expand Down Expand Up @@ -218,11 +222,16 @@
}

&__continue {
margin: 16px 0px;
margin: 16px $side-padding;
}
}

.group-details-panel {
& > * {
padding-right: $side-padding;
padding-left: $side-padding;
}

&__selected-count {
font-style: normal;
font-weight: 400;
Expand All @@ -237,6 +246,7 @@
}

&__create {
width: 100%;
margin: 16px 0px;
}

Expand Down

0 comments on commit a1fa298

Please sign in to comment.