move subscription to it's own row to avoid overlap issues

This commit is contained in:
Sean Yesmunt 2018-06-13 17:07:19 -04:00
parent d5ecf797fd
commit 4379bca73e
3 changed files with 19 additions and 14 deletions

View file

@ -21,7 +21,7 @@ class LoadScreen extends React.PureComponent<Props> {
<div className="load-screen"> <div className="load-screen">
<div className="load-screen__header"> <div className="load-screen__header">
<h1 className="load-screen__title">{__('LBRY')}</h1> <h1 className="load-screen__title">{__('LBRY')}</h1>
<sup className="load-scree__beta">beta</sup> <sup className="load-screen__beta">beta</sup>
</div> </div>
{isWarning ? ( {isWarning ? (
<span className="load-screen__message"> <span className="load-screen__message">

View file

@ -180,7 +180,6 @@ class FilePage extends React.Component<Props> {
{metadata.nsfw && <div>NSFW</div>} {metadata.nsfw && <div>NSFW</div>}
<div className="card__channel-info"> <div className="card__channel-info">
<UriIndicator uri={uri} link /> <UriIndicator uri={uri} link />
<div className="card__actions card__actions--no-margin"> <div className="card__actions card__actions--no-margin">
{claimIsMine ? ( {claimIsMine ? (
<Button <Button
@ -193,21 +192,23 @@ class FilePage extends React.Component<Props> {
}} }}
/> />
) : ( ) : (
<React.Fragment> <SubscribeButton uri={subscriptionUri} channelName={channelName} />
<Button
button="alt"
icon="Send"
label={__('Enjoy this? Send a tip')}
onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })}
/>
<SubscribeButton uri={subscriptionUri} channelName={channelName} />
</React.Fragment>
)}
{speechSharable && (
<ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} />
)} )}
</div> </div>
</div> </div>
<div className="card__actions card__actions--end">
{!claimIsMine && (
<Button
button="alt"
icon="Send"
label={__('Enjoy this? Send a tip')}
onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })}
/>
)}
{speechSharable && (
<ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} />
)}
</div>
<FormRow alignRight> <FormRow alignRight>
<FormField <FormField
type="checkbox" type="checkbox"

View file

@ -240,6 +240,10 @@
right: $spacing-vertical; right: $spacing-vertical;
} }
.card__actions--end {
justify-content: flex-end;
}
/* /*
.card-row is used on the discover page .card-row is used on the discover page
It is a list of cards that extend past the right edge of the screen It is a list of cards that extend past the right edge of the screen