Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
6 changes: 1 addition & 5 deletions src/components/PreferencesModal/GeneralTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { useUsers } from '../../lib/accounts'
import UserInfo from './UserInfo'
import LoginButton from '../atoms/LoginButton'
import { useAnalytics, analyticsEvents } from '../../lib/analytics'
import { IconArrowRotate } from '../icons'
import { FormCheckItem } from '../atoms/form'

const GeneralTab = () => {
Expand Down Expand Up @@ -81,10 +80,7 @@ const GeneralTab = () => {
loginState !== 'logging-in' ? (
<>{t('preferences.addAccount')}</>
) : (
<>
<IconArrowRotate />
{t('preferences.loginWorking')}
</>
<>{t('preferences.loginWorking')}</>
)
}
</LoginButton>
Expand Down
5 changes: 3 additions & 2 deletions src/components/PreferencesModal/PreferencesModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ import {
backgroundColor,
closeIconColor,
} from '../../lib/styled/styleFunctions'
import { IconClose } from '../icons'
import { useTranslation } from 'react-i18next'
import Icon from '../atoms/Icon'
import { mdiClose } from '@mdi/js'

const Container = styled.div`
z-index: 7000;
Expand Down Expand Up @@ -143,7 +144,7 @@ const PreferencesModal = () => {
</TabNav>
<TabContent>{content}</TabContent>
<CloseButton onClick={toggleClosed}>
<IconClose />
<Icon path={mdiClose} />
</CloseButton>
</Container>
)
Expand Down
7 changes: 4 additions & 3 deletions src/components/atoms/ButtonIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react'
import styled from '../../lib/styled'
import Icon from './Icon'

const StyledButtonIcon = styled.button`
color: currentColor;
Expand All @@ -14,14 +15,14 @@ const StyledButtonIcon = styled.button`
`

interface ButtonIconProps {
icon: React.ReactNode
iconPath: string
className?: string
onClick?: () => void
}

const ButtonIcon = ({ icon, className, onClick }: ButtonIconProps) => (
const ButtonIcon = ({ iconPath, className, onClick }: ButtonIconProps) => (
<StyledButtonIcon onClick={onClick} className={className}>
{icon}
<Icon path={iconPath} />
</StyledButtonIcon>
)

Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/PageContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from '../../lib/styled'

const PageContainer = styled.div`
padding: 3rem;
padding: 1em;
height: 100%;
overflow-y: auto;
`
Expand Down
48 changes: 0 additions & 48 deletions src/components/atoms/ToolbarIconInput.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/AddRound.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/AdjustVertical.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions src/components/icons/Alert.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/Alphabet.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/ArrowAgain.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/ArrowOutput.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/ArrowRotate.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/Bold.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/icons/Book.tsx

This file was deleted.

Loading