Style fixes #836

Merged
neb-b merged 4 commits from style-fixes into master 2017-12-11 04:29:30 +01:00
5 changed files with 7 additions and 4 deletions

View file

@ -8,6 +8,7 @@ const Link = props => {
style, style,
label, label,
icon, icon,
iconRight,
button, button,
disabled, disabled,
children, children,
@ -36,8 +37,9 @@ const Link = props => {
} else { } else {
content = ( content = (
<span {...("button" in props ? { className: "button__content" } : {})}> <span {...("button" in props ? { className: "button__content" } : {})}>
{"icon" in props ? <Icon icon={icon} fixed={true} /> : null} {icon ? <Icon icon={icon} fixed={true} /> : null}
{label ? <span className="link-label">{label}</span> : null} {label ? <span className="link-label">{label}</span> : null}
{iconRight ? <Icon icon={iconRight} fixed={true} /> : null}
</span> </span>
); );
} }

View file

@ -23,6 +23,7 @@ export default ({
return channelName && uri ? ( return channelName && uri ? (
<div className="card__actions"> <div className="card__actions">
<Link <Link
iconRight={isSubscribed ? "" : "at"}
button={isSubscribed ? "alt" : "primary"} button={isSubscribed ? "alt" : "primary"}
label={subscriptionLabel} label={subscriptionLabel}
onClick={() => subscriptionHandler({ onClick={() => subscriptionHandler({

View file

@ -33,7 +33,7 @@ class ModalEmailCollection extends React.PureComponent {
<Modal type="custom" isOpen={true} contentLabel="Email"> <Modal type="custom" isOpen={true} contentLabel="Email">
<section> <section>
<h3 className="modal__header"> <h3 className="modal__header">
Can We <strike>Touch You</strike> Stay In Touch? Can We Stay In Touch?
</h3> </h3>
{this.renderInner()} {this.renderInner()}
</section> </section>

View file

@ -182,7 +182,7 @@ export class FeaturedCategory extends React.PureComponent {
<h3 className="card-row__header"> <h3 className="card-row__header">
{categoryLink ? ( {categoryLink ? (
<Link <Link
className="no-underline" className="button-text no-underline"
label={category} label={category}
navigate="/show" navigate="/show"
navigateParams={{ uri: categoryLink }} navigateParams={{ uri: categoryLink }}

View file

@ -13,7 +13,7 @@
} }
.shapeshift__tx-info { .shapeshift__tx-info {
min-height: 55px; min-height: 63px;
} }
.shapeshift__deposit-address-wrapper { .shapeshift__deposit-address-wrapper {