From 763514564107473d62afd37caef4eeffb6c70ec3 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Fri, 11 May 2018 12:36:04 -0400 Subject: [PATCH] move file page autoplay setting below channel info; lint fixes --- src/renderer/page/file/view.jsx | 27 +++++++++++++------------- src/renderer/scss/component/_card.scss | 13 ++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx index e09a60947..d496a90b9 100644 --- a/src/renderer/page/file/view.jsx +++ b/src/renderer/page/file/view.jsx @@ -41,6 +41,7 @@ type Props = { playingUri: ?string, isPaused: boolean, claimIsMine: boolean, + autoplay: boolean, costInfo: ?{}, navigate: (string, ?{}) => void, openModal: ({ id: string }, { uri: string }) => void, @@ -78,6 +79,10 @@ class FilePage extends React.Component { } } + onAutoplayChange(event: SyntheticInputEvent<*>) { + this.props.setClientSetting(settings.AUTOPLAY, event.target.checked); + } + checkSubscription = (props: Props) => { if ( props.subscriptions @@ -97,10 +102,6 @@ class FilePage extends React.Component { } }; - onAutoplayChange(event: SyntheticInputEvent<*>) { - this.props.setClientSetting(settings.AUTOPLAY, event.target.checked); - } - render() { const { claim, @@ -116,7 +117,6 @@ class FilePage extends React.Component { prepareEdit, navigate, autoplay, - setClientSetting } = this.props; // File info @@ -159,14 +159,6 @@ class FilePage extends React.Component {
{isRewardContent && } -
@@ -200,6 +192,15 @@ class FilePage extends React.Component { )} +
+ +
diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss index 305fd8f33..659d35737 100644 --- a/src/renderer/scss/component/_card.scss +++ b/src/renderer/scss/component/_card.scss @@ -86,15 +86,10 @@ display: flex; align-items: center; .credit-amount, - .autoplay, .icon { margin-top: $spacing-vertical * 1/3; margin-left: $spacing-vertical * 2/3; } - - .autoplay .icon { - margin: 0 0 0 5px; - } } .card__title-identity-icons { @@ -173,12 +168,16 @@ display: flex; justify-content: space-between; align-items: center; - padding: $spacing-width 0; + padding: $spacing-width 0 0; } .card__channel-info--large { padding-top: 0; - padding-bottom: $spacing-width; + padding-bottom: 0; +} + +.autoplay div div input { + margin: 0 0 $spacing-vertical auto; } .card__content {