Replace classnames with clsx

This commit is contained in:
SleepWalker
2019-12-07 21:43:08 +02:00
parent d226fb2974
commit c638c1566e
29 changed files with 73 additions and 89 deletions

View File

@@ -1,6 +1,6 @@
import React from 'react';
import { FormattedMessage as Message } from 'react-intl';
import classNames from 'classnames';
import clsx from 'clsx';
import profileForm from '../../profileForm.scss';
import messages from '../MultiFactorAuth.intl.json';
@@ -33,12 +33,12 @@ export default class Instructions extends React.Component<{}, State> {
<div className={profileForm.formRow}>
<div
className={classNames(styles.instructionContainer, {
className={clsx(styles.instructionContainer, {
[styles.instructionActive]: !!activeOs,
})}
>
<div
className={classNames(styles.osList, {
className={clsx(styles.osList, {
[styles.androidActive]: activeOs === 'android',
[styles.appleActive]: activeOs === 'ios',
[styles.windowsActive]: activeOs === 'windows',

View File

@@ -1,5 +1,5 @@
import React from 'react';
import classNames from 'classnames';
import clsx from 'clsx';
import styles from './instructions.scss';
@@ -15,7 +15,7 @@ export default function OsInstruction({
onClick: (event: React.MouseEvent<any>) => void;
}) {
return (
<div className={classNames(styles.osTile, className)} onClick={onClick}>
<div className={clsx(styles.osTile, className)} onClick={onClick}>
<img className={styles.osLogo} src={logo} alt={label} />
<div className={styles.osName}>{label}</div>
</div>

View File

@@ -1,5 +1,5 @@
import React from 'react';
import classNames from 'classnames';
import clsx from 'clsx';
import { FormattedMessage as Message } from 'react-intl';
import { ImageLoader } from 'app/components/ui/loader';
import profileForm from 'app/components/profile/profileForm.scss';
@@ -31,12 +31,7 @@ export default function KeyForm({
</div>
<div className={profileForm.formRow}>
<p
className={classNames(
styles.manualDescription,
profileForm.description,
)}
>
<p className={clsx(styles.manualDescription, profileForm.description)}>
<span className={styles.or}>
<Message {...messages.or} />
</span>