blockworks-foundation
/
mango-ui-v3
mirror of https://github.com/blockworks-foundation/mango-ui-v3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #247 from blockworks-foundation/filter-and-account-buttons 

fix button positions on mobile
This commit is contained in:
tjshipe 2022-04-09 13:15:00 -04:00 committed by GitHub
parent 52c49aac66 c33b1dde15
commit a0ec154f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/TradeHistoryTable.tsx
View File

@ -154,7 +154,7 @@ const TradeHistoryTable = ({
return ( return (
<> <>
{showActions ? ( {showActions ? (
<div className="flex flex-col pb-3 sm:flex-row sm:items-center sm:justify-between"> <div className="flex items-center justify-between pb-3">
<div className="flex items-center"> <div className="flex items-center">
<h4 className="mb-0 flex items-center text-th-fgd-1"> <h4 className="mb-0 flex items-center text-th-fgd-1">
{data.length === 1 {data.length === 1
@ -195,7 +195,7 @@ const TradeHistoryTable = ({
) : null} ) : null}
</div> </div>
<div className="flex flex-col space-y-3 pl-2 sm:flex-row sm:items-center sm:space-y-0 sm:space-x-3"> <div className="flex items-center space-x-3">
{hasActiveFilter ? ( {hasActiveFilter ? (
<LinkButton <LinkButton
className="order-4 mt-3 flex items-center justify-end whitespace-nowrap text-xs sm:order-first sm:mt-0" className="order-4 mt-3 flex items-center justify-end whitespace-nowrap text-xs sm:order-first sm:mt-0"
@ -209,7 +209,7 @@ const TradeHistoryTable = ({
tradeHistory.length <= 10000 && tradeHistory.length <= 10000 &&
initialLoad ? ( initialLoad ? (
<Button <Button
className="order-3 mt-3 flex h-8 items-center justify-center whitespace-nowrap pt-0 pb-0 pl-3 pr-3 text-xs sm:order-first sm:mt-0" className="order-3 flex h-8 items-center justify-center whitespace-nowrap pt-0 pb-0 pl-3 pr-3 text-xs sm:order-first"
onClick={() => setShowFiltersModal(true)} onClick={() => setShowFiltersModal(true)}
> >
<FilterIcon className="mr-1.5 h-4 w-4" /> <FilterIcon className="mr-1.5 h-4 w-4" />

11
pages/account.tsx
View File

@ -302,9 +302,9 @@ export default function Account() {
</div> </div>
</div> </div>
{!pubkey ? ( {!pubkey ? (
<div className="flex flex-col items-center space-y-3 pb-1.5 sm:flex-row sm:space-y-0 sm:space-x-2"> <div className="flex items-center space-x-2">
<button <button
className="flex h-8 w-full items-center justify-center rounded-full bg-th-primary px-3 py-0 text-xs font-bold text-th-bkg-1 hover:brightness-[1.15] focus:outline-none disabled:cursor-not-allowed disabled:bg-th-bkg-4 disabled:text-th-fgd-4 disabled:hover:brightness-100 sm:w-auto" className="flex h-8 w-full items-center justify-center rounded-full bg-th-primary px-3 py-0 text-xs font-bold text-th-bkg-1 hover:brightness-[1.15] focus:outline-none disabled:cursor-not-allowed disabled:bg-th-bkg-4 disabled:text-th-fgd-4 disabled:hover:brightness-100"
disabled={mngoAccrued.eq(ZERO_BN)} disabled={mngoAccrued.eq(ZERO_BN)}
onClick={handleRedeemMngo} onClick={handleRedeemMngo}
> >
@ -324,11 +324,8 @@ export default function Account() {
</button> </button>
<Menu> <Menu>
{({ open }) => ( {({ open }) => (
<div <div className="relative sm:w-full">
className="relative w-full sm:w-auto" <Menu.Button className="flex h-8 items-center justify-center rounded-full bg-th-bkg-button pt-0 pb-0 pl-3 pr-2 text-xs font-bold hover:brightness-[1.1] hover:filter sm:w-full">
id="profile-menu-tip"
>
<Menu.Button className="flex h-8 w-full items-center justify-center rounded-full bg-th-bkg-button pt-0 pb-0 pl-3 pr-2 text-xs font-bold hover:brightness-[1.1] hover:filter sm:w-auto">
{t('more')} {t('more')}
<ChevronDownIcon <ChevronDownIcon
className={`default-transition h-5 w-5 ${ className={`default-transition h-5 w-5 ${