Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
5 changes: 5 additions & 0 deletions src/components/Persona/Persona.Props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ export interface IPersonaProps extends React.HTMLProps<Persona> {
*/
secondaryText?: string;

/**
* Optional control to display/update, usually the role of the user.
*/
innerControl?: JSX.Element;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this.


/**
* Tertiary text to display, usually the status of the user.
*/
Expand Down
1 change: 0 additions & 1 deletion src/components/Persona/Persona.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ $ms-color-initials-darkRed: #b91d47;
display: table-cell;
padding: 0 12px;
vertical-align: middle;
overflow: hidden;
}

.ms-Persona-primaryText,
Expand Down
10 changes: 5 additions & 5 deletions src/components/Persona/Persona.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export class Persona extends React.Component<IPersonaProps, any> {
};

public render() {
let { className, size, imageUrl, imageInitials, initialsColor, presence, primaryText, secondaryText, tertiaryText, optionalText, hidePersonaDetails } = this.props;
let { className, size, imageUrl, imageInitials, initialsColor, presence, primaryText, secondaryText, tertiaryText, optionalText, hidePersonaDetails } = this.props;

return (
return (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please undo the 4 space indentation.

<div { ... this.props as any } className={ css('ms-Persona', className, PERSONA_SIZE[size], PERSONA_PRESENCE[presence]) }>
{ size !== PersonaSize.tiny && (
<div className='ms-Persona-imageArea'>
Expand All @@ -35,7 +35,6 @@ export class Persona extends React.Component<IPersonaProps, any> {
) }

{ presence !== PersonaPresence.none && <div className='ms-Persona-presence'></div> }

{ !hidePersonaDetails && (
<div className='ms-Persona-details'>
<div className='ms-Persona-primaryText'>{ primaryText }</div>
Expand All @@ -44,8 +43,9 @@ export class Persona extends React.Component<IPersonaProps, any> {
) : (null) }
<div className='ms-Persona-tertiaryText'>{ tertiaryText }</div>
<div className='ms-Persona-optionalText'>{ optionalText }</div>
</div>) }
</div>
{ this.props.children }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent 2 spaces

</div>) }
</div>
);
}
}