Skip to content

Commit 1013d29

Browse files
chore: antd last cleanup (#900)
* chore: remove redundant component * chore: remove Headline component * chore: update readme for stacks * chore: remove antd unused styles
1 parent 6906d59 commit 1013d29

File tree

10 files changed

+23
-79
lines changed

10 files changed

+23
-79
lines changed

.storybook/preview.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom'
77
import { AppProvider } from '../src/renderer/contexts/AppContext'
88
import { ThemeProvider, themes } from '../src/renderer/contexts/ThemeContext'
99
import { getMessagesByLocale } from '../src/renderer/i18n'
10-
import * as Styled from '../src/renderer/views/app/AppView.styles'
1110
import { Locale } from '../src/shared/i18n/types'
1211

1312
import * as mockApi from '../src/shared/mock/api'
@@ -33,9 +32,9 @@ const providerDecorator: Decorator = (Story) => (
3332
{/* We use IntlProvider instead of our our custom I18nProvider to provide messages, but w/o dependencies to Electron/Node source, which can't run in storybook */}
3433
<IntlProvider locale={locale} messages={messages} defaultLocale={locale}>
3534
<ThemeProvider theme={lightTheme}>
36-
<Styled.AppWrapper>
35+
<div className="h-screen p-0 bg-bg3 dark:bg-bg3d font-main">
3736
<Story />
38-
</Styled.AppWrapper>
37+
</div>
3938
</ThemeProvider>
4039
</IntlProvider>
4140
</AppProvider>

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,16 @@ This is the developer source repository, general information, and download page
110110

111111
_(in alphabetical order)_
112112

113-
- [Ant Design](https://github.com/ant-design/ant-design/)
114113
- [ESLint](https://github.com/eslint/eslint)
115114
- [Electron](https://github.com/electron/electron/)
116115
- [fp-ts](https://gcanti.github.io/fp-ts/)
116+
- [HeadlessUI](https://headlessui.com/)
117117
- [Observable Hooks](https://observable-hooks.js.org/)
118118
- [Prettier](https://github.com/prettier/prettier)
119119
- [ReactJS](https://github.com/facebook/react/)
120120
- [Styled Components](https://styled-components.com/)
121121
- [RxJS](https://rxjs.dev/)
122+
- [TailwindCSS](https://tailwindcss.com/)
122123
- [Typescript](https://github.com/microsoft/TypeScript)
123124
- [Vite](https://github.com/vitejs/vite)
124125
- [Vitest](https://github.com/vitest-dev/vitest)

src/renderer/components/LayoutlessWrapper/LayoutlessWrapper.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import { HeaderTheme } from '../header/theme'
33
import { BackLinkButton } from '../uielements/button'
4-
import { Headline } from '../uielements/headline'
4+
import { Label } from '../uielements/label'
55
import { LocaleDropdown } from './LocaleDropdown'
66

77
type Props = {
@@ -22,7 +22,9 @@ export const LayoutlessWrapper = ({ title, children }: Props) => {
2222

2323
<div className="flex flex-col p-4 w-full max-w-[420px]">
2424
<div className="flex items-center mb-10">
25-
<Headline>{title}</Headline>
25+
<Label align="center" size="large" textTransform="uppercase" weight="bold">
26+
{title}
27+
</Label>
2628
</div>
2729

2830
{children}

src/renderer/components/poolActionsHistory/WalletPoolActionsHistoryHeader.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { useIntl } from 'react-intl'
77
import { WalletAddress, WalletAddresses } from '../../../shared/wallet/types'
88
import { AccountAddressSelector } from '../AccountAddressSelector'
99
import { ExternalLinkIcon } from '../uielements/common/Common.styles'
10-
import { Headline } from '../uielements/headline'
10+
import { Label } from '../uielements/label'
1111
import { PoolActionsHistoryFilter } from './PoolActionsHistoryFilter'
1212
import { Filter } from './types'
1313

@@ -57,12 +57,18 @@ export const WalletPoolActionsHistoryHeader = (props: Props) => {
5757
/>
5858
</div>
5959
<div className="flex items-center justify-center pt-5 md:pt-0 md:grow md:justify-end">
60-
<Headline className="flex items-center !w-auto" onClick={onClickAddressIcon}>
60+
<Label
61+
className="flex items-center !w-auto"
62+
size="large"
63+
textTransform="uppercase"
64+
align="center"
65+
weight="bold"
66+
onClick={onClickAddressIcon}>
6167
{protocol === THORChain
6268
? intl.formatMessage({ id: 'common.runeScan' })
6369
: intl.formatMessage({ id: 'common.mayaScan' })}
6470
<ExternalLinkIcon className="ml-2" width={18} height={18} />
65-
</Headline>
71+
</Label>
6672
</div>
6773
</>
6874
)

src/renderer/components/uielements/headline/Headline.stories.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/renderer/components/uielements/headline/Headline.styles.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/renderer/components/uielements/headline/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/renderer/views/app/AppView.styles.ts

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,8 @@
11
import styled from 'styled-components'
2-
import { palette } from 'styled-theme'
32

43
import { Alert as UIAlert } from '../../components/uielements/alert'
54
import { media } from '../../helpers/styleHelper'
65

7-
// AppWrapper styled component
8-
export const AppWrapper = styled.div`
9-
height: 100vh;
10-
background: ${palette('background', 3)};
11-
padding: 0;
12-
13-
font-family: 'MainFontRegular';
14-
15-
a {
16-
transition: none;
17-
}
18-
19-
.ant {
20-
&-btn,
21-
&-input,
22-
&-menu,
23-
&-input-affix-wrapper,
24-
&-table-thead > tr > th,
25-
&-table-tbody > tr > td {
26-
transition: none;
27-
}
28-
&-form-item-explain {
29-
text-transform: uppercase;
30-
}
31-
&-form-item-explain-error {
32-
color: ${palette('error', 0)};
33-
}
34-
}
35-
`
36-
376
export const Alert = styled(UIAlert)`
387
margin-bottom: 10px;
398

src/renderer/views/app/AppView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export const AppView = (): JSX.Element => {
159159
}, [])
160160

161161
return (
162-
<Styled.AppWrapper>
162+
<div className="h-screen p-0 bg-bg3 dark:bg-bg3d font-main">
163163
{shouldHideLayout ? (
164164
<ViewRoutes />
165165
) : (
@@ -194,6 +194,6 @@ export const AppView = (): JSX.Element => {
194194
</div>
195195
</div>
196196
)}
197-
</Styled.AppWrapper>
197+
</div>
198198
)
199199
}

src/renderer/views/wallet/LedgerChainSelectView.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { AssetIcon } from '../../components/uielements/assets/assetIcon'
2121
import { FlatButton } from '../../components/uielements/button'
2222
import { BackLinkButton } from '../../components/uielements/button/BackLinkButton'
2323
import { Dropdown } from '../../components/uielements/dropdown'
24-
import { Headline } from '../../components/uielements/headline'
2524
import { Input } from '../../components/uielements/input'
2625
import { Label } from '../../components/uielements/label'
2726
import { Spin } from '../../components/uielements/spin'
@@ -204,9 +203,9 @@ export const LedgerChainSelectView: React.FC = () => {
204203

205204
<div className="flex-1 px-6 pt-8">
206205
<div className="w-full max-w-2xl mx-auto">
207-
<Headline size="large" color="primary" className="mb-8 text-center">
206+
<Label className="mb-8" align="center" size="large" color="primary" textTransform="uppercase" weight="bold">
208207
{intl.formatMessage({ id: 'ledger.detect.title' })}
209-
</Headline>
208+
</Label>
210209

211210
<Spin
212211
className="min-h-24 border border-gray0 dark:border-gray0d rounded-lg mb-6"
@@ -250,9 +249,9 @@ export const LedgerChainSelectView: React.FC = () => {
250249

251250
<div className="flex-1 flex flex-col items-center px-6 pb-6">
252251
<div className="w-full max-w-2xl">
253-
<Headline size="large" color="primary" className="mb-2 text-center">
252+
<Label align="center" size="large" color="primary" textTransform="uppercase" weight="bold" className="mb-2">
254253
{intl.formatMessage({ id: 'ledger.connect.title' })}
255-
</Headline>
254+
</Label>
256255

257256
<p className="text-center text-text2 dark:text-text2d text-16 mb-8">
258257
{intl.formatMessage({ id: 'ledger.connect.instruction' })}

0 commit comments

Comments
 (0)