Skip to content

Commit

Permalink
Merge pull request #681 from thematters/fix/styles
Browse files Browse the repository at this point in the history
Bugfix & Style Improvements
  • Loading branch information
robertu7 authored Feb 7, 2020
2 parents 4242107 + 96bd646 commit 7c716c4
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
10 changes: 10 additions & 0 deletions src/common/styles/bases/defaults.css
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,13 @@ samp,
pre {
background: var(--color-grey-lighter);
}

code,
kbd,
samp {
padding: var(--spacing-xx-tight);
}

pre {
padding: var(--spacing-x-tight) var(--spacing-base);
}
2 changes: 1 addition & 1 deletion src/common/utils/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface ValidEmailOptions {
allowPlusSign: boolean
}

const EMAIL_DOMAIN_WHITELIST = ['matters.news']
const EMAIL_DOMAIN_WHITELIST = ['matters.news', 'like.co']

export const isValidEmail = (str: string, options: ValidEmailOptions) => {
const { allowPlusSign } = options
Expand Down
7 changes: 6 additions & 1 deletion src/components/Notice/NoticeComment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ const NoticeComment = ({ comment }: { comment: NoticeCommentType | null }) => {

return (
<section className="comment-content">
<Card {...path} bgColor="grey-lighter" spacing={['xtight', 'base']}>
<Card
{...path}
bgColor="grey-lighter"
spacing={['xtight', 'base']}
borderRadius="xxtight"
>
<Expandable>
<CommentContent comment={comment} size="sm" />
</Expandable>
Expand Down
2 changes: 1 addition & 1 deletion src/components/UserDigest/Rich/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const Rich = ({
<section className={containerClass}>
<Link {...path}>
<a className="avatar">
<Avatar size={size === 'sm' ? 'lg' : 'xl'} />
<Avatar size={size === 'sm' ? 'lg' : 'xl'} user={user} />
{avatarBadge && <span className="badge">{avatarBadge}</span>}
</a>
</Link>
Expand Down
7 changes: 6 additions & 1 deletion src/views/Follow/FollowFeed/FollowComment/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@ const FollowComment = ({
</section>

<section className="comment-content">
<Card {...path} bgColor="grey-lighter" spacing={['xtight', 'base']}>
<Card
{...path}
bgColor="grey-lighter"
spacing={['xtight', 'base']}
borderRadius="xxtight"
>
<Expandable limit={5} buffer={2}>
<Comment.Content comment={comment} size="md-s" />
</Expandable>
Expand Down

0 comments on commit 7c716c4

Please sign in to comment.