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,
label,
icon,
iconRight,
button,
disabled,
children,
@ -36,8 +37,9 @@ const Link = props => {
} else {
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}
{iconRight ? <Icon icon={iconRight} fixed={true} /> : null}
</span>
);
}

View file

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

View file

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

View file

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

View file

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