(Feat): Menu should show username on sm screens
(Feat): Menu should show username on sm screens (Feat): Menu should show username on sm screens (Feat): Menu should show username on sm screens
This commit is contained in:
@ -3,7 +3,7 @@ import { Link } from 'react-router';
|
|||||||
|
|
||||||
// this is separated out to prevent react bootstrap's
|
// this is separated out to prevent react bootstrap's
|
||||||
// NavBar from injecting unknown props to the li component
|
// NavBar from injecting unknown props to the li component
|
||||||
export default function AvatarPointsNavItem({ picture, points }) {
|
export default function AvatarPointsNavItem({ picture, points, username }) {
|
||||||
return (
|
return (
|
||||||
<li
|
<li
|
||||||
className='avatar-points'
|
className='avatar-points'
|
||||||
@ -11,7 +11,8 @@ export default function AvatarPointsNavItem({ picture, points }) {
|
|||||||
>
|
>
|
||||||
<Link to='/settings'>
|
<Link to='/settings'>
|
||||||
<span className='brownie-points-nav'>
|
<span className='brownie-points-nav'>
|
||||||
[ { points || 1 } ]
|
<span className='hidden-md hidden-lg'> { username } </span>
|
||||||
|
<span class='brownie-points'> [ { points || 1 } ] </span>
|
||||||
</span>
|
</span>
|
||||||
<span className='hidden-xs hidden-sm avatar'>
|
<span className='hidden-xs hidden-sm avatar'>
|
||||||
<img
|
<img
|
||||||
@ -25,6 +26,7 @@ export default function AvatarPointsNavItem({ picture, points }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AvatarPointsNavItem.propTypes = {
|
AvatarPointsNavItem.propTypes = {
|
||||||
|
username: PropTypes.string,
|
||||||
picture: PropTypes.string,
|
picture: PropTypes.string,
|
||||||
points: React.PropTypes.number
|
points: PropTypes.number
|
||||||
};
|
};
|
||||||
|
@ -171,6 +171,7 @@ export default class extends React.Component {
|
|||||||
<AvatarPointsNavItem
|
<AvatarPointsNavItem
|
||||||
picture={ picture }
|
picture={ picture }
|
||||||
points={ points }
|
points={ points }
|
||||||
|
username={ username }
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
@ -25,6 +25,8 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
|
|||||||
else
|
else
|
||||||
li.avatar-points
|
li.avatar-points
|
||||||
a(href='/settings')
|
a(href='/settings')
|
||||||
span.brownie-points-nav [ #{user.points} ]
|
span.brownie-points-nav
|
||||||
|
span.hidden-md.hidden-lg #{user.username}
|
||||||
|
span.brownie-points [ #{user.points} ]
|
||||||
span.hidden-xs.hidden-sm.avatar
|
span.hidden-xs.hidden-sm.avatar
|
||||||
img.profile-picture.float-right(src='#{user.picture}')
|
img.profile-picture.float-right(src='#{user.picture}')
|
||||||
|
Reference in New Issue
Block a user