Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accepting pull requests? #17

Merged
merged 12 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
8 changes: 4 additions & 4 deletions src/components/AppsComponents/AppCard/AppCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const AppCard: FC<AppCardProps> = (props) => {
href={props.address}
target='_blank'
rel='noreferrer'
className='w-1/2 shadow-md flex justify-center items-center p-2 text-white bg-yellow-500 hover:bg-yellow-400'
className='w-1/2 rounded shadow-md flex justify-center items-center p-2 text-white bg-yellow-500 hover:bg-yellow-400'
>
<LinkIcon />
&nbsp;{t('apps.open')}
Expand All @@ -49,23 +49,23 @@ export const AppCard: FC<AppCardProps> = (props) => {
{props.installed && !props.address && (
<button
disabled={true}
className='w-1/2 shadow-md flex justify-center items-center p-2 text-white bg-gray-400 cursor-default'
className='w-1/2 rounded shadow-md flex justify-center items-center p-2 text-white bg-gray-400 cursor-default'
>
{t('apps.no_page')}
</button>
)}
{!props.installed && (
<button
disabled={props.installing}
className='w-1/2 shadow-md flex justify-center items-center p-2 text-white bg-yellow-500 hover:bg-yellow-400 disabled:bg-gray-400 disabled:text-white disabled:pointer-events-none'
className='w-1/2 rounded shadow-md flex justify-center items-center p-2 text-white bg-yellow-500 hover:bg-yellow-400 disabled:bg-gray-400 disabled:text-white disabled:pointer-events-none'
onClick={() => props.onInstall(id)}
>
<PlusIcon />
&nbsp;{t('apps.install')}
</button>
)}
<button
className='w-1/2 shadow-md flex justify-center items-center p-2 dark:bg-gray-500 hover:bg-gray-300 dark:hover:bg-gray-300 dark:hover:text-black'
className='w-1/2 rounded shadow-md flex justify-center items-center p-2 dark:bg-gray-500 hover:bg-gray-300 dark:hover:bg-gray-300 dark:hover:text-black'
onClick={() => props.onOpenDetails(id)}
>
<InfoIcon />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const AppStatusCard: FC<AppStatusCardProps> = (props) => {
const status = online ? t('apps.online') : t('apps.offline');

return (
<div className='p-5 h-auto'>
<div className='p-5 h-full'>
<div className='bd-card transition-colors'>
cstenglein marked this conversation as resolved.
Show resolved Hide resolved
<div className='flex flex-row my-2 items-center w-full'>
{/* Icon */}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const ChangePwModal: FC<ChangePwModalProps> = (props) => {
<h3 className='font-bold'>{t('settings.change_pw')}</h3>
{isLoading && <LoadingSpinner />}
{!isLoading && (
<div className='my-5 flex flex-col justify-center text-center items-center'>
<div className='mt-5 flex flex-col justify-center text-center items-center'>
cstenglein marked this conversation as resolved.
Show resolved Hide resolved
<div className='w-full md:w-10/12 py-1'>
<label htmlFor='oldpw' className='label-underline'>
{t('settings.old_pw')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const I18nDropdown: FC = () => {
{t('settings.curr_lang')}:&nbsp;<strong>{i18n.language}</strong>
</div>
<div className='flex justify-between'>
<label htmlFor='lngSelect' className='font-bold'>
<label htmlFor='lngSelect' className='font-bold flex items-center'>
{t('settings.language')}
</label>
<select id='lngSelect' ref={selectRef} onChange={dropdownHandler} className='border w-1/3 dark:text-black'>
Expand All @@ -50,7 +50,7 @@ const I18nDropdown: FC = () => {
<button
onClick={saveLangHandler}
disabled={!saveLang}
className='w-1/3 shadow-xl rounded text-white bg-yellow-500 hover:bg-yellow-400 disabled:bg-gray-400'
className='w-1/3 shadow-xl rounded text-white bg-yellow-500 hover:bg-yellow-400 disabled:bg-gray-400 py-1'
>
Save
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Shared/ReceiveModal/ReceiveModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const ReceiveModal: FC<ReceiveModalProps> = (props) => {
)}
<form className='flex flex-col items-center' onSubmit={generateAddressHandler}>
<div className='w-full overflow-x-auto m-2'>{address}</div>
<div className='w-4/5 mb-5'>
<div className='w-4/5'>
{isLoading && (
<div className='p-5'>
<LoadingSpinner />
Expand Down
2 changes: 1 addition & 1 deletion src/components/Shared/SendModal/SendModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const SendModal: FC<SendModalProps> = (props) => {
/>
</div>
</div>
<div className='inline-block w-4/5 lg:w-3/12 align-top mb-5'>
<div className='inline-block w-4/5 lg:w-3/12 align-top'>
<button
type='submit'
className='text-center h-10 bg-yellow-500 hover:bg-yellow-400 dark:hover:bg-yellow-400 rounded-lg text-white w-full'
Expand Down
4 changes: 2 additions & 2 deletions src/container/ActionBox/ActionBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const ActionBox: FC<ActionBoxProps> = (props) => {
<div className='w-full lg:w-1/3 dark:text-white transition-colors box-border pt-5 px-5'>
<div className='relative bg-white dark:bg-gray-800 p-5 rounded shadow-xl'>
<div className='flex justify-between'>
<div className='font-bold w-1/2 xl:w-2/3'>{props.name}</div>
<div className='font-bold w-1/2 xl:w-2/3 flex items-center'>{props.name}</div>
<button
className='w-1/2 xl:w-1/3 shadow-xl rounded text-white bg-yellow-500 hover:bg-yellow-400'
className='w-1/2 xl:w-1/3 shadow-xl rounded text-white bg-yellow-500 hover:bg-yellow-400 py-1'
onClick={props.action}
>
{props.actionName}
Expand Down
4 changes: 2 additions & 2 deletions src/container/ModalDialog/ModalDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ const ModalDialog: FC<ModalDialogProps> = (props) => {
return (
<ModalBackground>
<div className='w-4/5 h-auto lg:w-1/2 xl:w-2/5 xl:max-w-screen-sm bg-white text-center rounded-lg flex flex-col mx-5 dark:bg-gray-800 dark:text-white'>
<div className='flex'>
<div className='flex pr-2 pt-1'>
<button onClick={props.close} className='flex items-end ml-auto h-7 w-7 mt-1'>
<XIcon className='w-full h-full' />
</button>
</div>
<div className='px-5'>{props.children}</div>
<div className='px-5 pb-10'>{props.children}</div>
cstenglein marked this conversation as resolved.
Show resolved Hide resolved
</div>
</ModalBackground>
);
Expand Down
4 changes: 2 additions & 2 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
}

.bd-card {
@apply h-full shadow-xl rounded-md bg-white px-6 py-4 text-black dark:text-white dark:bg-gray-600;
@apply h-full shadow-xl rounded-md bg-white px-6 py-6 text-black dark:text-white dark:bg-gray-600;
}

.page-container {
@apply h-full w-full md:w-10/12 md:ml-auto mb-16 md:mb-0 mt-16 overflow-y-auto transition-colors;
}
}