Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update username style #1264

Merged
merged 6 commits into from
Dec 27, 2017
Merged

Update username style #1264

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed9f752
Update username style
Sekhmet Dec 26, 2017
ada2799
Merge branch 'master' into username-link
Sekhmet Dec 26, 2017
0e355b3
Merge branch 'master' into username-link
Sekhmet Dec 26, 2017
101a224
Make reputation tag bold
Sekhmet Dec 26, 2017
83bfb91
Merge branch 'username-link' of github.com:Sekhmet/busy into username…
Sekhmet Dec 26, 2017
33a9d6e
Merge branch 'master' into username-link
Sekhmet Dec 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 52 additions & 14 deletions src/client/activity/UserActionMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@ class UserActionMessage extends React.Component {
id="account_created_with_delegation"
defaultMessage="{creator} created account with delegation {account}"
values={{
creator: <Link to={`/@${actionDetails.creator}`}>{actionDetails.creator}</Link>,
creator: (
<Link to={`/@${actionDetails.creator}`}>
<span className="username">{actionDetails.creator}</span>
</Link>
),
account: (
<Link to={`/@${actionDetails.new_account_name}`}>
{actionDetails.new_account_name}
<span className="username">{actionDetails.new_account_name}</span>
</Link>
),
}}
Expand All @@ -49,10 +53,14 @@ class UserActionMessage extends React.Component {
id="account_created"
defaultMessage="{creator} created account {account}"
values={{
creator: <Link to={`/@${actionDetails.creator}`}>{actionDetails.creator}</Link>,
creator: (
<Link to={`/@${actionDetails.creator}`}>
<span className="username">{actionDetails.creator}</span>
</Link>
),
account: (
<Link to={`/@${actionDetails.new_account_name}`}>
{actionDetails.new_account_name}
<span className="username">{actionDetails.new_account_name}</span>
</Link>
),
}}
Expand All @@ -64,17 +72,23 @@ class UserActionMessage extends React.Component {
);
case accountHistoryConstants.COMMENT: {
const author = _.isEmpty(actionDetails.parent_author) ? (
<Link to={`/@${actionDetails.author}`}>{actionDetails.author}</Link>
<Link to={`/@${actionDetails.author}`}>
<span className="username">{actionDetails.author}</span>
</Link>
) : (
<Link to={`/@${actionDetails.parent_author}`}>{actionDetails.parent_author}</Link>
<Link to={`/@${actionDetails.parent_author}`}>
<span className="username">{actionDetails.parent_author}</span>
</Link>
);
const postLink = _.isEmpty(actionDetails.parent_author) ? (
<Link to={`/p/@${actionDetails.author}/${actionDetails.permlink}`}>
{actionDetails.permlink}
</Link>
) : (
<Link
to={`/p/@${actionDetails.parent_author}/${actionDetails.parent_permlink}#@${actionDetails.author}/${actionDetails.permlink}`}
to={`/p/@${actionDetails.parent_author}/${actionDetails.parent_permlink}#@${
actionDetails.author
}/${actionDetails.permlink}`}
>
{actionDetails.parent_permlink}
</Link>
Expand All @@ -96,7 +110,11 @@ class UserActionMessage extends React.Component {
id="user_replied_to"
defaultMessage="{username} replied to {author} ({postLink})"
values={{
username: <Link to={`/@${actionDetails.author}`}>{actionDetails.author}</Link>,
username: (
<Link to={`/@${actionDetails.author}`}>
<span className="username">{actionDetails.author}</span>
</Link>
),
author,
postLink,
}}
Expand Down Expand Up @@ -149,11 +167,15 @@ class UserActionMessage extends React.Component {
/>
),
author: (
<Link to={`/@${actionDetails.comment_author}`}>{actionDetails.comment_author}</Link>
<Link to={`/@${actionDetails.comment_author}`}>
<span className="username">{actionDetails.comment_author}</span>
</Link>
),
postLink: (
<Link
to={`/p/@${actionDetails.comment_author}/${actionDetails.comment_permlink}#@${actionDetails.comment_author}/${actionDetails.comment_permlink}`}
to={`/p/@${actionDetails.comment_author}/${actionDetails.comment_permlink}#@${
actionDetails.comment_author
}/${actionDetails.comment_permlink}`}
>
{actionDetails.comment_permlink}
</Link>
Expand All @@ -168,8 +190,16 @@ class UserActionMessage extends React.Component {
id="account_approve_witness"
defaultMessage="{account} approve witness {witness}"
values={{
account: <Link to={`/@${actionDetails.account}`}>{actionDetails.account}</Link>,
witness: <Link to={`/@${actionDetails.witness}`}>{actionDetails.witness}</Link>,
account: (
<Link to={`/@${actionDetails.account}`}>
<span className="username">{actionDetails.account}</span>
</Link>
),
witness: (
<Link to={`/@${actionDetails.witness}`}>
<span className="username">{actionDetails.witness}</span>
</Link>
),
}}
/>
);
Expand All @@ -179,8 +209,16 @@ class UserActionMessage extends React.Component {
id="account_unapprove_witness"
defaultMessage="{account} unapprove witness {witness}"
values={{
account: <Link to={`/@${actionDetails.account}`}>{actionDetails.account}</Link>,
witness: <Link to={`/@${actionDetails.witness}`}>{actionDetails.witness}</Link>,
account: (
<Link to={`/@${actionDetails.account}`}>
<span className="username">{actionDetails.account}</span>
</Link>
),
witness: (
<Link to={`/@${actionDetails.witness}`}>
<span className="username">{actionDetails.witness}</span>
</Link>
),
}}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion src/client/activity/UserActivityActions.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
&__message {
display: flex;
flex-direction: row;
font-weight: bold;
color: @grey-mortar;
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/client/activity/VoteActionMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,19 @@ const VoteActionMessage = ({ actionDetails, currentUsername }) => {
id={`user_${voteType}_post`}
defaultMessage={`{username} ${voteType}`}
values={{
username: <Link to={`/@${actionDetails.voter}`}>{actionDetails.voter}</Link>,
username: (<Link to={`/@${actionDetails.voter}`}>
<span className="username">{actionDetails.voter}</span>
</Link>),
}}
/>}
{actionDetails.weight === 0
? ' '
: <Tooltip title={<FormattedMessage id="voting_weight" defaultMessage="Vote Weight" />}>
{' ('}{voteWeight}{') '}
</Tooltip>}
<Link to={`/@${actionDetails.author}`}>{actionDetails.author}</Link>
<Link to={`/@${actionDetails.author}`}>
<span className="username">{actionDetails.author}</span>
</Link>
{' ('}<Link to={`/p/${postLink}`}>{actionDetails.permlink}</Link>{')'}
</span>
);
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/Comments/Comment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ import './Comment.less';
<Avatar username={comment.author} size={comment.depth === 1 ? 40 : 32} />
<div className="Comment__text">
<Link to={`/@${comment.author}`}>
{comment.author}
<span className="username">{comment.author}</span>
<Tooltip
title={intl.formatMessage({
id: 'reputation_score',
Expand Down
19 changes: 8 additions & 11 deletions src/client/components/Comments/Comment.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,17 @@
margin-left: @comment-text-left-margin;
overflow: unset;

& > a {
& > a > .ant-tag {
font-weight: bold;
font-size: 12px;
vertical-align: 1px;

.ant-tag {
font-size: 12px;
vertical-align: 1px;

&:first-of-type {
margin-left: 4px;
}
&:first-of-type {
margin-left: 4px;
}

&:last-child {
margin-right: 0;
}
&:last-child {
margin-right: 0;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/Sidebar/PostRecommendation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PostRecommendation extends Component {
values={{
username: (
<Link role="presentation" to={`/@${post.author}`}>
{post.author}
<span className="username">{post.author}</span>
</Link>
),
}}
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/Sidebar/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const User = ({ user }) => (
<Avatar username={user.name} size={34} />
</Link>
<Link to={`/@${user.name}`} title={user.name} className="User__name">
{user.name}
<span className="username">{user.name}</span>
</Link>
</div>
<div className="User__follow">
Expand Down
6 changes: 4 additions & 2 deletions src/client/components/Story/Story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@ class Story extends React.Component {
id="reblogged_username"
defaultMessage="{username} reblogged"
values={{
username: <Link to={`/@${post.first_reblogged_by}`}>{post.first_reblogged_by}</Link>,
username: (<Link to={`/@${post.first_reblogged_by}`}>
<span className="username">{post.first_reblogged_by}</span>
</Link>),
}}
/>
</div>
Expand Down Expand Up @@ -254,7 +256,7 @@ class Story extends React.Component {
<span className="Story__header__flex">
<Link to={`/@${post.author}`}>
<h4>
{post.author}
<span className="username">{post.author}</span>
<Tooltip title={intl.formatMessage({ id: 'reputation_score' })}>
<Tag>{postAuthorReputation}</Tag>
</Tooltip>
Expand Down
18 changes: 7 additions & 11 deletions src/client/components/Story/Story.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,15 @@
margin-left: 0 12px;
}

a > h4 {
a > h4 > .ant-tag {
font-weight: bold;
color: @primary-color;
margin-left: 6px;
font-size: 12px;
vertical-align: 1px;
padding: 0 4px;

.ant-tag {
margin-left: 6px;
font-size: 12px;
vertical-align: 1px;
padding: 0 4px;

@media @small {
padding: 0 8px;
}
@media @small {
padding: 0 8px;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/Story/StoryFull.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class StoryFull extends React.Component {
</Link>
<div className="StoryFull__header__text">
<Link to={`/@${post.author}`}>
{post.author}
<span className="username">{post.author}</span>
<Tooltip
title={intl.formatMessage({
id: 'reputation_score',
Expand Down
4 changes: 2 additions & 2 deletions src/client/components/Story/StoryFull.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
& > a {
display: block;
font-size: 20px;
font-weight: bold;


.ant-tag {
font-weight: bold;
margin-left: 8px;
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/client/components/UserCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ const UserCard = ({ username, alt }) => (
<Link to={`/@${username}`}>
<Avatar username={username} size={40} />
</Link>
<Link to={`/@${username}`}>{username}</Link>
<Link to={`/@${username}`}>
<span className="username">{username}</span>
</Link>
{alt && <span className="UserCard__alt">{alt}</span>}
</div>
<FollowButton username={username} />
Expand Down
8 changes: 2 additions & 6 deletions src/client/components/UserCard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@
display: flex;
align-items: center;

& > a {
font-weight: 500;

&:nth-child(2) {
margin-left: 8px;
}
& > a:nth-child(2) {
margin-left: 8px;
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/client/discover/Discover.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@
}
}

&__name {
font-weight: bold;
}

&_about {
color: @blue-botticelli;
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/discover/DiscoverUser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const DiscoverUser = ({ user }) => {
<div className="Discover__user__profile__header">
<Link to={`/@${user.name}`}>
<span className="Discover__user__name">
{name || user.name}
<span className="username">{name || user.name}</span>
</span>
</Link>
<Tag>{reputation}</Tag>
Expand Down
1 change: 0 additions & 1 deletion src/client/search/Search.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
&__name {
margin: 0 6px;
font-size: 18px;
font-weight: bold;
}
}
}
2 changes: 1 addition & 1 deletion src/client/search/SearchResultPostPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const SearchResultPostPreview = ({ author, summary, created, permlink, title, ta
</Link>
<div className="Search__post__header__author">
<Link to={`/@${author}`}>
<b>{author}</b>
<span className="username">{author}</span>
</Link>
<div className="Search__post__created">
<FormattedRelative value={created} />
Expand Down
2 changes: 1 addition & 1 deletion src/client/search/SearchResultUserPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const SearchResultUserPreview = ({ username }) => (
<Avatar username={username} size={40} />
</Link>
<Link to={`/@${username}`}>
<span className="Search__user__name">{username}</span>
<span className="Search__user__name username">{username}</span>
</Link>
</div>
);
Expand Down
7 changes: 7 additions & 0 deletions src/client/styles/common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import (reference) "./custom.less";

body {
overflow-y: scroll;
}
Expand Down Expand Up @@ -63,6 +65,11 @@ video {
}
}

.username {
color: @black;
font-weight: normal;
}

iframe {
border: none;
}
Expand Down
4 changes: 3 additions & 1 deletion src/client/wallet/ReceiveTransaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const ReceiveTransaction = ({ from, memo, amount, timestamp }) => (
id="received_from"
defaultMessage="Received from {username}"
values={{
username: <Link to={`/@${from}`}>{from}</Link>,
username: (<Link to={`/@${from}`}>
<span className="username">{from}</span>
</Link>),
}}
/>
<span className="UserWalletTransactions__received">
Expand Down
Loading