Skip to content

Commit c9b40c0

Browse files
committed
Merge branch 'master' of github.com:FormidableLabs/spectacle
* 'master' of github.com:FormidableLabs/spectacle: Add bulletStyle types, doc updates (FormidableLabs#703)
2 parents 04ce903 + b5ccab9 commit c9b40c0

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ further defined and clarified by project maintainers.
106106
### Enforcement
107107

108108
Instances of abusive, harassing, or otherwise unacceptable behavior may be
109-
reported by contacting the project team at emma.brillhart@formidable.com. All
109+
reported by contacting the project team at coc@formidable.com. All
110110
complaints will be reviewed and investigated and will result in a response that
111111
is deemed necessary and appropriate to the circumstances. The project team is
112112
obligated to maintain confidentiality with regard to the reporter of an incident.

index.d.ts

+16-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ declare module 'spectacle' {
1919
| 'flex-end center'
2020
| 'flex-end flex-end';
2121

22+
/**
23+
* Bullet Style Types for Spectacle
24+
*/
25+
type bulletStyleType =
26+
| 'arrow'
27+
| 'classicCheck'
28+
| 'cross'
29+
| 'greenCheck'
30+
| 'star';
31+
2232
/**
2333
* Animation Types for Spectacle
2434
*/
@@ -212,6 +222,10 @@ declare module 'spectacle' {
212222
target?: targetType;
213223
}
214224

225+
interface ListProps extends BaseProps {
226+
bulletStyle?: bulletStyleType;
227+
}
228+
215229
interface MarkdownProps {
216230
mdastConfig?: { [key: string]: number | string };
217231
source?: string;
@@ -280,9 +294,9 @@ declare module 'spectacle' {
280294

281295
class Link extends React.Component<LinkProps> {}
282296

283-
class List extends React.Component<BaseProps> {}
297+
class List extends React.Component<ListProps> {}
284298

285-
class ListItem extends React.Component<BaseProps> {}
299+
class ListItem extends React.Component<ListProps> {}
286300

287301
class Markdown extends React.Component<MarkdownProps> {}
288302

0 commit comments

Comments
 (0)