Skip to content
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
28c97b5
Add zIndex variables
Mar 21, 2018
0236305
Make zIndex a namespace
Mar 21, 2018
50f5437
Start converting styles
Mar 21, 2018
fb5a0f4
Add noWrap general function
Mar 21, 2018
25b9a98
Add contrast colors
Mar 21, 2018
aeed10f
Add styles up to isAway modifier
Mar 21, 2018
80fccfa
Finish adding styles from scss, comment sections.
Mar 22, 2018
c8aaafd
Add temporary className strings
Mar 22, 2018
78da7f2
EOD
Mar 23, 2018
9e92ebe
EOD:
Mar 24, 2018
9b8c8be
Get styles 99% accurate.
Mar 27, 2018
e7d223d
Update types to shared.
Mar 27, 2018
b6525fe
Update exports
Mar 27, 2018
5370ee8
Export PersonaCoinBase from PersonaCoin.tsx
Mar 27, 2018
bd78c17
Finish PersonaPresenceBase
Mar 27, 2018
59a4ce3
Cleanup and adjust types
Mar 27, 2018
e0f5ea3
Update test for decorated Persona
Mar 27, 2018
1eed711
Delete sass files
Mar 27, 2018
16350cd
Delete PersonaConsts file (logic is now in styles files)
Mar 27, 2018
e1d9fc3
Update Snapshots
Mar 27, 2018
c1c972f
Add black-on-white media query
Mar 27, 2018
e0cea16
Fix high contrast styles, remove unused styles and consts
Mar 27, 2018
f387c7e
Organize and cleanup
Mar 28, 2018
9c5c7dc
Remove ampersands for High Contrast nesting bug workaround.
Mar 28, 2018
a340976
Move Persona render funtion types
Mar 28, 2018
bee0413
Enable getStyles as prop
Mar 28, 2018
6b36f14
Merge Master, resolve conflict with IPersonaProps componentRef.
Mar 28, 2018
e025b51
Fix conflicts
Mar 28, 2018
0bcb20a
Update snapshots
Mar 28, 2018
c6d114b
Fix all ":after" elements getting styles applied.
Mar 28, 2018
6f56372
Remove redundant styles
Mar 28, 2018
0b36bb1
Make secondaryText default height const
Mar 28, 2018
4e35d93
Increase readability
Mar 28, 2018
80275c2
Add newlines between props
Mar 28, 2018
e022670
Remove bang from getClassNames(getStyles) to allow null.
Mar 28, 2018
bfc5279
Add some more comments and some more cleaning
Mar 28, 2018
95e2ea6
External personaSize and personaPresenceSize
Mar 28, 2018
d0d16ac
Reintroduce PersonaConsts for use in styles files.- personaSize names…
Mar 28, 2018
42fa3f5
Merge master, fix allowPhoneInitials conflicts
Mar 28, 2018
0956686
Cut down on repeating styles
Mar 28, 2018
bbe5f2d
Remove deprecated Placeholder className (not used)
Mar 28, 2018
43c3b23
Remove zIndex API.
Mar 28, 2018
92ac11e
Use className from coinProps if it exists,
Mar 29, 2018
0839ce7
Update ActivityItem snapshot
Mar 29, 2018
b7f7083
finish removing zIndex
Mar 29, 2018
0e73517
Add showIcon prop
Apr 3, 2018
176f2c2
Remove display: none styles from presenceIcon
Apr 3, 2018
a8038cd
Modify coinSize related consts to adhere to IStyleSet.
Apr 3, 2018
3f1c860
Split Icon into private render method to conditionally render.
Apr 3, 2018
b611433
Remove showIcon prop.
Apr 4, 2018
3d4f956
Change to const
Apr 4, 2018
7946509
npm run change output
Apr 4, 2018
3af9b45
Fix ImageFitStyles for both RTL and LTR
Apr 5, 2018
fc62a9f
Use semantic color
Apr 5, 2018
8b1cb9e
Use border instead of box-shadow
Apr 5, 2018
3ab7396
Update snapshots
Apr 5, 2018
cb4782e
Remove new contrast colors and selector
Apr 5, 2018
40d5236
Add backgroundClip to IRawStyleBase
Apr 5, 2018
c006bf9
Major cleanup:
Apr 5, 2018
93d4aed
Add backgroundClip to lessen bleed on Edge.
Apr 6, 2018
a3dcb2f
Remove some added features from changelog
Apr 6, 2018
e853fd9
remove display property
Apr 6, 2018
146d607
Better documentation
Apr 6, 2018
34146e8
More documentation
Apr 6, 2018
c3bfbc7
nit
Apr 6, 2018
e6edd59
Update snapshot
Apr 6, 2018
09d8c4d
revert
jordandrako Apr 7, 2018
e78c886
Bump bundlesize .1kB
jordandrako Apr 7, 2018
2a02099
Remove fallback
jordandrako Apr 7, 2018
3ac4134
Remove fallback
jordandrako Apr 7, 2018
307919a
Merge branch 'master' into mergeStyles/persona-part2
jordandrako Apr 7, 2018
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
4 changes: 2 additions & 2 deletions apps/vr-tests/src/stories/PeoplePicker.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ const suggestionProps = {
suggestionsContainerAriaLabel: 'Suggested contacts'
};

let getTextFromItem = (persona: IPersonaProps): string => persona.primaryText as string;
const getTextFromItem = (persona: IPersonaProps): string => persona.primaryText as string;

let getPeople = () => people;
const getPeople = () => people;

// Pickers that are 'disabled' are added before the Screener decorator because css classes for suggestion items won't exist
storiesOf('PeoplePicker', module)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/styling",
"comment": "Add noWrap style set.",
"type": "minor"
}
],
"packageName": "@uifabric/styling",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Convert Persona and PersonaCoin and PersonaPresence to mergeStyles. Create IPersonaSharedProps for props that apply to Persona and PersonaCoin and PersonaPresence. Other refactors.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
10 changes: 10 additions & 0 deletions packages/merge-styles/src/IRawStyleBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,16 @@ export interface IRawStyleBase extends IRawFontStyle {
*/
backgroundBlendMode?: ICSSRule | string;

/**
* The background-clip CSS property specifies if an element's
* background, whether a <color> or an <image>, extends
* underneath its border.
*
* The `text` value is experimental and should not be used
Copy link
Contributor

Choose a reason for hiding this comment

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

should also note it doesn't work in IE

* in production code.
*/
backgroundClip?: ICSSRule | 'border-box' | 'padding-box' | 'content-box' | 'text';

/**
* Sets the background color of an element.
*/
Expand Down
4 changes: 1 addition & 3 deletions packages/office-ui-fabric-react/src/PersonaCoin.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
export * from './components/Persona/PersonaCoin';
export * from './components/Persona/Persona.types';
export * from './components/Persona/PersonaConsts';
export * from './components/Persona/index';
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { BaseComponent } from '../../Utilities';
import { IActivityItemProps, IActivityItemStyles } from './ActivityItem.types';
import { IActivityItemClassNames, getClassNames } from './ActivityItem.classNames';
import { getStyles } from './ActivityItem.styles';
import { PersonaSize, PersonaCoin, IPersonaProps } from '../../Persona';
import { PersonaSize, PersonaCoin, IPersonaSharedProps } from '../../Persona';

export class ActivityItem extends BaseComponent<IActivityItemProps, {}> {
constructor(props: IActivityItemProps) {
Expand Down Expand Up @@ -90,7 +90,7 @@ export class ActivityItem extends BaseComponent<IActivityItemProps, {}> {
const classNames = this._getClassNames(props);

let personaElement: JSX.Element | null = null;
const activityPersonas = props.activityPersonas as Array<IPersonaProps & { key?: string | number }>;
const activityPersonas = props.activityPersonas as Array<IPersonaSharedProps & { key?: string | number }>;
if (activityPersonas[0].imageUrl || activityPersonas[0].imageInitials) {
const personaList: Array<JSX.Element> = [];
const showSize16Personas = (activityPersonas.length > 1 || props.isCompact);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { IStyle } from '../../Styling';
import { IRenderFunction } from '../../Utilities';
import { IPersonaProps } from '../../Persona';
import { IPersonaSharedProps } from '../../Persona';

// Please keep alphabetized
export interface IActivityItemProps extends React.AllHTMLAttributes<HTMLElement> {
Expand All @@ -24,7 +24,7 @@ export interface IActivityItemProps extends React.AllHTMLAttributes<HTMLElement>
/**
* If activityIcon is not set, then the persona props in this array will be used as the icon for the this activity item.
*/
activityPersonas?: Array<IPersonaProps>;
activityPersonas?: Array<IPersonaSharedProps>;

/**
* An element containing the text of comments or @mention messages. If no comments, commentText, or onRenderComments are included, no comments are shown.
Expand Down
Loading