Skip to content

adding an optional control property to the Persona control #215

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
abenems merged 16 commits into from
Sep 1, 2016
Merged

adding an optional control property to the Persona control #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
99cfc93
adding an optional control property to the Persona control, to suppor…
abenems Aug 30, 2016
97b3614
adding an optional control property to the Persona control, to suppor…
abenems Aug 30, 2016
1429b46
adding an optional control property to the Persona control, to suppor…
abenems Aug 31, 2016
80688df
adding an optional control property to the Persona control, to suppor…
abenems Aug 31, 2016
d075473
adding an optional control property to the Persona control, to suppor…
abenems Aug 31, 2016
e66c6c0
adding an optional control property to the Persona control, to suppor…
abenems Sep 1, 2016
3961871
adding an optional control property to the Persona control, to suppor…
abenems Sep 1, 2016
672fc58
adding an optional control property to the Persona control, to suppor…
abenems Sep 1, 2016
e528947
adding an optional control property to the Persona control, to suppor…
abenems Sep 1, 2016
904b62c
Merge branch 'master' into master
abenems Sep 1, 2016
aad2691
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
abenems Sep 1, 2016
9f29593
adding an optional control property to the Persona control, to suppor…
abenems Sep 1, 2016
a3e48fe
Merge branch 'master' of https://github.com/abenems/office-ui-fabric-…
abenems Sep 1, 2016
969aace
resolve comments
abenems Sep 1, 2016
50d8142
resolve comments
abenems Sep 1, 2016
97e0884
Minor changes.
abenems Sep 1, 2016
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
1 change: 0 additions & 1 deletion src/components/Persona/Persona.scss
View file
Open in desktop
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
19 changes: 15 additions & 4 deletions src/components/Persona/Persona.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,29 @@ 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 (
<div { ... this.props as any } className={ css('ms-Persona', className, PERSONA_SIZE[size], PERSONA_PRESENCE[presence]) }>
<div { ...this.props as any } className={ css('ms-Persona', className, PERSONA_SIZE[size], PERSONA_PRESENCE[presence]) }>
{ size !== PersonaSize.tiny && (
<div className='ms-Persona-imageArea'>
<div className={ css('ms-Persona-initials', PERSONA_INITIALS_COLOR[initialsColor]) }>{ imageInitials }</div>
<Image className='ms-Persona-image' imageFit={ ImageFit.cover } src={ imageUrl } />
</div>
) }

{ 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,6 +54,7 @@ export class Persona extends React.Component<IPersonaProps, any> {
) : (null) }
<div className='ms-Persona-tertiaryText'>{ tertiaryText }</div>
<div className='ms-Persona-optionalText'>{ optionalText }</div>
{ this.props.children }
Copy link
Member

@dzearing dzearing Sep 1, 2016

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>
);
Expand Down