Skip to content

Issue 2435 fix #8

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

Merged
merged 3 commits into from
Jun 13, 2019
Merged

Issue 2435 fix #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
929b35b
Merge pull request #1 from topcoder-platform/develop
PrakashDurlabhji Jun 12, 2019
2355cbf
issue 2435 fix
PrakashDurlabhji Jun 12, 2019
8aae32c
issue 2435 font fix
PrakashDurlabhji Jun 13, 2019
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
42 changes: 21 additions & 21 deletions dist/dev/index.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/prod/index.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/assets/sass/_global/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ $gray-03: #AAA;
$gray-02: #E0E0E0;
$gray-hover-profile-icon: rgba(85, 85, 85, 0.4);
$gray-neutral-light: #FBFBFB;
$gray-joining-date: #404041;

$turquoise: #43D7B0;
$turquoise-dark: #0AB88A;
Expand Down
3 changes: 2 additions & 1 deletion src/components/AccountMenu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import IconAvatar from '../../assets/images/img-vic-tor-avatar.svg'
import IconCloseDark from '../../assets/images/icon-close-dark.svg'
import IconSwitchBusiness from '../../assets/images/icon-switch-business.svg'
import styles from './styles.module.scss'
import moment from 'moment'

class AccountMenu extends React.Component {
renderLink (menu, i) {
Expand Down Expand Up @@ -57,7 +58,7 @@ class AccountMenu extends React.Component {
}
<div className={styles['handle-container']}>
<span className={styles['handle']}>@{_.isEmpty(profile) ? '' : profile.handle}</span>
<span className={styles['description']}>{_.isEmpty(profile) ? '' : profile.description}</span>
<span className={styles['description']}>{_.isEmpty(profile) ? '' : `Member since ${moment(profile.createdAt).format('MMMM, YYYY')}`}</span>
</div>
</div>
<span role='button' className={styles['icon-close']} onClick={onClose}>
Expand Down
2 changes: 2 additions & 0 deletions src/components/AccountMenu/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@
}

.description {
@include Roboto-Regular;
font-size: 12px;
color: $gray-joining-date;
}
}

Expand Down