Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/appear.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Appear extends Component {
{({ opacity }) =>
React.cloneElement(child, {
className: 'fragment',
style: { ...child.props.style, opacity },
style: [child.props.style, this.props.style, opacity],
ref: f => {
this.fragmentRef = f;
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/block-quote.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class BlockQuote extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<blockquote className={this.props.className} style={[this.context.styles.components.blockquote, getStyles.call(this), this.props.style, typefaceStyle]}>
<blockquote className={this.props.className} style={[this.context.styles.components.blockquote, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</blockquote>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/cite.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class Cite extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<cite className={this.props.className} style={[this.context.styles.components.cite, getStyles.call(this), this.props.style, typefaceStyle]}>
<cite className={this.props.className} style={[this.context.styles.components.cite, getStyles.call(this), typefaceStyle, this.props.style]}>
- {this.props.children}
</cite>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/heading.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default class Heading extends Component {
) : (
createElement(Tag, {
className: this.props.className,
style: [this.context.styles.components.heading[`h${size}`], getStyles.call(this), styles.nonFit, style, typefaceStyle]
style: [this.context.styles.components.heading[`h${size}`], getStyles.call(this), styles.nonFit, typefaceStyle, style]
}, children)
)
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export default class Image extends Component {
style={[
this.context.styles.components.image,
getStyles.call(this),
styles,
this.props.style
this.props.style,
styles
]}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class Link extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<a className={this.props.className} href={this.props.href} target={this.props.target} style={[this.context.styles.components.link, getStyles.call(this), this.props.style, typefaceStyle]}>
<a className={this.props.className} href={this.props.href} target={this.props.target} style={[this.context.styles.components.link, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</a>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/list-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class ListItem extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<li className={this.props.className} style={[this.context.styles.components.listItem, getStyles.call(this), this.props.style, typefaceStyle]}>
<li className={this.props.className} style={[this.context.styles.components.listItem, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</li>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/quote.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class Quote extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<span className={this.props.className} style={[this.context.styles.components.quote, getStyles.call(this), this.props.style, typefaceStyle]}>
<span className={this.props.className} style={[this.context.styles.components.quote, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</span>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/slide.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ class Slide extends React.PureComponent {
}}
className={`${contentClass} spectacle-content`}
style={[
styles.content,
this.context.styles.components.content,
this.context.overview && overViewStyles.content,
styles.content,
]}
>
{children}
Expand Down
2 changes: 1 addition & 1 deletion src/components/table-header-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class TableHeaderItem extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<td className={this.props.className} style={[this.context.styles.components.tableHeaderItem, getStyles.call(this), this.props.style, typefaceStyle]}>
<td className={this.props.className} style={[this.context.styles.components.tableHeaderItem, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</td>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/table-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class TableItem extends Component {
render() {
const typefaceStyle = this.context.typeface || {};
return (
<td className={this.props.className} style={[this.context.styles.components.tableItem, getStyles.call(this), this.props.style, typefaceStyle]}>
<td className={this.props.className} style={[this.context.styles.components.tableItem, getStyles.call(this), typefaceStyle, this.props.style]}>
{this.props.children}
</td>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/text.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default class Text extends Component {
</span>
</div>
) : (
<p className={this.props.className} style={[this.context.styles.components.text, getStyles.call(this), styles.nonFit, style, typefaceStyle]}>
<p className={this.props.className} style={[this.context.styles.components.text, getStyles.call(this), styles.nonFit, typefaceStyle, style]}>
{children}
</p>
)
Expand Down