Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

fix: hscroll for current and suggested channels panels #1527

Merged
merged 1 commit into from
Feb 7, 2019
Merged

fix: hscroll for current and suggested channels panels #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/components/Contacts/AddChannel/AddChannel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const AddChannel = ({

<Bar my={3} borderColor="gray" css={{ opacity: 0.3 }} />

<Panel.Body css={{ 'overflow-y': 'overlay' }}>
<Panel.Body css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}>
{filteredNetworkNodes.length > 0 &&
filteredNetworkNodes.map(node => {
const canConnectToNode = canConnect(node)
Expand Down
2 changes: 1 addition & 1 deletion app/components/Contacts/Network/Network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class Network extends Component {
)}
</Panel.Header>

<Panel.Body css={{ 'overflow-y': 'overlay' }}>
<Panel.Body css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}>
{!hasChannels && <SuggestedNodes py={3} mx={3} />}

{hasChannels && (
Expand Down
7 changes: 6 additions & 1 deletion app/components/UI/Modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ class Modal extends React.Component {
</Flex>
)}
</Panel.Header>
<Panel.Body px={4} pb={4} {...rest} css={{ 'overflow-y': 'overlay' }}>
<Panel.Body
px={4}
pb={4}
{...rest}
css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}
>
{' '}
{children}
</Panel.Body>
Expand Down
1 change: 1 addition & 0 deletions test/unit/components/UI/__snapshots__/Modal.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`component.UI.Modal should render correctly 1`] = `
-ms-flex: 1;
flex: 1;
overflow-y: overlay;
overflow-x: hidden;
}

.c0 {
Expand Down