Unverified Commit b824579a authored by Ryan Lieu's avatar Ryan Lieu Committed by GitHub

Reverse frequent user order positioning (#167)

parent 899c2aff
.sb-avatar > div {
border: 1px solid white;
}
.sb-avatar > img {
margin: 0px;
}
@import 'bootstrap-custom'; @import 'bootstrap-custom';
@import 'avatars';
@import 'buttons'; @import 'buttons';
@import 'fonts'; @import 'fonts';
@import 'icons'; @import 'icons';
......
...@@ -48,10 +48,6 @@ ...@@ -48,10 +48,6 @@
box-shadow: 0px 0px 10px -1px rgba(0, 0, 0, .76); box-shadow: 0px 0px 10px -1px rgba(0, 0, 0, .76);
} }
.sb-avatar > div {
border: 1px solid white;
}
.logo-icon { .logo-icon {
max-height: 32px; max-height: 32px;
max-width: 144px; max-width: 144px;
......
...@@ -124,12 +124,11 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone ...@@ -124,12 +124,11 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone
}) })
}; };
getAvatarForUser(fullName, profileUrl) { getAvatarForUser(fullName, profileUrl, zIndex) {
const popoverHoverFocus = ( const popoverHoverFocus = (
<Popover id="popover-trigger-hover-focus"> <Popover id="popover-trigger-hover-focus">
{fullName} {fullName}
</Popover>); </Popover>);
if (profileUrl.length !== 0) { if (profileUrl.length !== 0) {
return ( return (
<OverlayTrigger key={fullName} trigger={['hover', 'focus']} placement="top" overlay={popoverHoverFocus}> <OverlayTrigger key={fullName} trigger={['hover', 'focus']} placement="top" overlay={popoverHoverFocus}>
...@@ -137,7 +136,7 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone ...@@ -137,7 +136,7 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone
style={{ display: 'inline-block', marginLeft: '-5px', backgroundColor: 'white', borderRadius: '90%'}} style={{ display: 'inline-block', marginLeft: '-5px', backgroundColor: 'white', borderRadius: '90%'}}
onClick={this.frequentUserOnClick} onClick={this.frequentUserOnClick}
> >
<Avatar name={fullName} size={25} round={true} style={{ border: '1px solid white' }} /> <Avatar name={fullName} size={25} round={true} style={{zIndex, position: 'relative'}} />
</a> </a>
</OverlayTrigger> </OverlayTrigger>
); );
...@@ -146,7 +145,7 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone ...@@ -146,7 +145,7 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone
<OverlayTrigger key={fullName} trigger={['hover', 'focus']} placement="top" overlay={popoverHoverFocus}> <OverlayTrigger key={fullName} trigger={['hover', 'focus']} placement="top" overlay={popoverHoverFocus}>
<div style={{display: 'inline-block', marginLeft: '-5px', <div style={{display: 'inline-block', marginLeft: '-5px',
backgroundColor: 'white', borderRadius: '90%'}}> backgroundColor: 'white', borderRadius: '90%'}}>
<Avatar name={fullName} size={25} round={true} style={{border: '1px solid white'}}/> <Avatar name={fullName} size={25} round={true} style={{zIndex, position: 'relative'}}/>
</div> </div>
</OverlayTrigger> </OverlayTrigger>
); );
...@@ -223,12 +222,12 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone ...@@ -223,12 +222,12 @@ export class TableDetail extends React.Component<TableDetailProps & RouteCompone
// "Frequent Users" section // "Frequent Users" section
const readerSectionRenderer = () => { const readerSectionRenderer = () => {
return (data.table_readers && data.table_readers.length > 0) ? return (data.table_readers && data.table_readers.length > 0) ?
data.table_readers.map((entry) => { data.table_readers.map((entry, index) => {
const fullName = entry.reader.display_name; const fullName = entry.reader.display_name;
const profileUrl = entry.reader.profile_url; const profileUrl = entry.reader.profile_url;
return ( return (
this.getAvatarForUser(fullName, profileUrl) this.getAvatarForUser(fullName, profileUrl, data.table_readers.length - index)
); );
}) : }) :
(<label className="m-auto">No frequent users exist</label>); (<label className="m-auto">No frequent users exist</label>);
......
...@@ -19,7 +19,3 @@ ...@@ -19,7 +19,3 @@
font-weight: normal; font-weight: normal;
min-width: 0; min-width: 0;
} }
.sb-avatar > img {
margin: 0px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment