Skip to content

Commit

Permalink
Put user css last
Browse files Browse the repository at this point in the history
  • Loading branch information
fkhadra committed Apr 24, 2018
1 parent e89e031 commit 551b8f8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion dist/ReactToastify.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ReactToastify.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/components/ProgressBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ function ProgressBar({
const classNames = cx(
'Toastify__progress-bar',
`Toastify__progress-bar--${type}`,
className,
{
'Toastify__progress-bar--rtl': rtl
}
},
className
);

return (
Expand Down
11 changes: 8 additions & 3 deletions src/components/Toast.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,14 @@ class Toast extends Component {
} = this.props;

const toastProps = {
className: cx('Toastify__toast', `Toastify__toast--${type}`, className, {
'Toastify__toast--rtl': rtl
})
className: cx(
'Toastify__toast',
`Toastify__toast--${type}`,
{
'Toastify__toast--rtl': rtl
},
className
)
};

if (autoClose && pauseOnHover) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/ToastContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ class ToastContainer extends Component {
className: cx(
'Toastify__toast-container',
`Toastify__toast-container--${position}`,
className,
{ 'Toastify__toast-container--rtl': this.props.rtl }
{ 'Toastify__toast-container--rtl': this.props.rtl },
className
),
style: disablePointer
? { ...style, pointerEvents: 'none' }
Expand Down

0 comments on commit 551b8f8

Please sign in to comment.