Merged in fix/3697-prettier-configs (pull request #3396)
fix(SW-3691): Setup one prettier config for whole repo * Setup prettierrc in root and remove other configs Approved-by: Joakim Jäderberg Approved-by: Linus Flood
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import { Button as ButtonRAC } from 'react-aria-components'
|
||||
import { Loading } from '../Loading/Loading'
|
||||
import { Button as ButtonRAC } from "react-aria-components"
|
||||
import { Loading } from "../Loading/Loading"
|
||||
|
||||
import { MaterialIcon } from '../Icons/MaterialIcon'
|
||||
import { Typography } from '../Typography'
|
||||
import type { ButtonProps } from './types'
|
||||
import { variants } from './variants'
|
||||
import { MaterialIcon } from "../Icons/MaterialIcon"
|
||||
import { Typography } from "../Typography"
|
||||
import type { ButtonProps } from "./types"
|
||||
import { variants } from "./variants"
|
||||
|
||||
export function Button({
|
||||
variant,
|
||||
@@ -30,9 +30,9 @@ export function Button({
|
||||
return (
|
||||
<Typography
|
||||
variant={
|
||||
size === 'sm'
|
||||
? 'Body/Supporting text (caption)/smBold'
|
||||
: 'Body/Paragraph/mdBold'
|
||||
size === "sm"
|
||||
? "Body/Supporting text (caption)/smBold"
|
||||
: "Body/Paragraph/mdBold"
|
||||
}
|
||||
>
|
||||
<ButtonRAC {...props} className={classNames}>
|
||||
@@ -43,7 +43,7 @@ export function Button({
|
||||
<MaterialIcon
|
||||
icon={leadingIconName}
|
||||
color="CurrentColor"
|
||||
size={size === 'sm' ? 20 : 24}
|
||||
size={size === "sm" ? 20 : 24}
|
||||
/>
|
||||
) : null}
|
||||
{children}
|
||||
@@ -51,11 +51,11 @@ export function Button({
|
||||
<MaterialIcon
|
||||
icon={trailingIconName}
|
||||
color="CurrentColor"
|
||||
size={size === 'sm' ? 20 : 24}
|
||||
size={size === "sm" ? 20 : 24}
|
||||
/>
|
||||
) : null}
|
||||
{isPending ? (
|
||||
<Loading size={size === 'sm' ? 18 : 20} type="CurrentColor" />
|
||||
<Loading size={size === "sm" ? 18 : 20} type="CurrentColor" />
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user