From a89d528709d6dcea84e03d129c8d3ba0e862346c Mon Sep 17 00:00:00 2001 From: saml33 Date: Fri, 21 Apr 2023 12:32:20 +1000 Subject: [PATCH] align linkbutton styles --- components/ThemeSwitcher.tsx | 2 +- components/account/ActionsLinkButton.tsx | 2 +- components/chat/Chat.tsx | 2 +- components/modals/UserSetupModal.tsx | 42 ++--------------------- components/profile/EditNftProfilePic.tsx | 2 +- components/shared/BalancesTable.tsx | 4 +-- components/shared/Button.tsx | 2 +- components/shared/MaxAmountButton.tsx | 2 +- components/trade/AdvancedMarketHeader.tsx | 2 +- components/trade/MarketCloseModal.tsx | 2 +- components/trade/PerpPositions.tsx | 3 +- 11 files changed, 14 insertions(+), 51 deletions(-) diff --git a/components/ThemeSwitcher.tsx b/components/ThemeSwitcher.tsx index 03d5bdad..5994d6d8 100644 --- a/components/ThemeSwitcher.tsx +++ b/components/ThemeSwitcher.tsx @@ -15,7 +15,7 @@ const ThemeSwitcher = () => { > {THEMES.map((value) => ( setTheme(t(value))} diff --git a/components/account/ActionsLinkButton.tsx b/components/account/ActionsLinkButton.tsx index 2f53a399..9523f20b 100644 --- a/components/account/ActionsLinkButton.tsx +++ b/components/account/ActionsLinkButton.tsx @@ -13,7 +13,7 @@ const ActionsLinkButton = ({ }) => { return ( diff --git a/components/chat/Chat.tsx b/components/chat/Chat.tsx index 415dc5d9..74bc3f95 100644 --- a/components/chat/Chat.tsx +++ b/components/chat/Chat.tsx @@ -85,7 +85,7 @@ const Chat = () => { )}
- + Content Policy
diff --git a/components/modals/UserSetupModal.tsx b/components/modals/UserSetupModal.tsx index daf3173b..25ceebd3 100644 --- a/components/modals/UserSetupModal.tsx +++ b/components/modals/UserSetupModal.tsx @@ -368,9 +368,7 @@ const UserSetupModal = ({ )} - - {t('onboarding:skip')} - + {t('onboarding:skip')} @@ -513,9 +511,7 @@ const UserSetupModal = ({ )} - - {t('onboarding:skip')} - + {t('onboarding:skip')} @@ -547,40 +543,6 @@ const UserSetupModal = ({ ) : null} - {/* - {showSetupStep === 4 ? ( -
-

- {t('onboarding:your-profile')} -

-

{t('onboarding:profile-desc')}

- {!showEditProfilePic ? ( -
- setShowEditProfilePic(true)} - onboarding - /> - - - {t('onboarding:skip-finish')} - - -
- ) : null} - -
- setShowEditProfilePic(false)} - /> -
-
-
- ) : null} -
*/}
diff --git a/components/profile/EditNftProfilePic.tsx b/components/profile/EditNftProfilePic.tsx index 562c3a21..784e658f 100644 --- a/components/profile/EditNftProfilePic.tsx +++ b/components/profile/EditNftProfilePic.tsx @@ -153,7 +153,7 @@ const EditNftProfilePic = ({ onClose }: { onClose: () => void }) => { {t('save')} {profile?.profile_image_url ? ( - + {t('profile:remove')} ) : null} diff --git a/components/shared/BalancesTable.tsx b/components/shared/BalancesTable.tsx index ea429edc..daa39dfe 100644 --- a/components/shared/BalancesTable.tsx +++ b/components/shared/BalancesTable.tsx @@ -324,7 +324,7 @@ const Balance = ({ bank }: { bank: BankWithBalance }) => { {!isUnownedAccount ? ( asPath.includes('/trade') && isBaseOrQuote ? ( handleTradeFormBalanceClick(Math.abs(balance), isBaseOrQuote) } @@ -336,7 +336,7 @@ const Balance = ({ bank }: { bank: BankWithBalance }) => { ) : asPath.includes('/swap') ? ( handleSwapFormBalanceClick( Number(formatNumericValue(balance, tokenBank.mintDecimals)) diff --git a/components/shared/Button.tsx b/components/shared/Button.tsx index e63bba78..541167c3 100644 --- a/components/shared/Button.tsx +++ b/components/shared/Button.tsx @@ -114,7 +114,7 @@ export const LinkButton: FunctionComponent = ({ disabled={disabled} className={`flex items-center border-0 font-bold ${ secondary ? 'text-th-active' : 'text-th-fgd-2' - } rounded-sm underline focus-visible:text-th-active focus-visible:no-underline disabled:cursor-not-allowed disabled:opacity-50 md:hover:no-underline ${className}`} + } rounded-sm focus-visible:text-th-active focus-visible:underline disabled:cursor-not-allowed disabled:opacity-50 ${className} md:hover:text-th-fgd-3`} {...props} type="button" > diff --git a/components/shared/MaxAmountButton.tsx b/components/shared/MaxAmountButton.tsx index 7a881040..258a5405 100644 --- a/components/shared/MaxAmountButton.tsx +++ b/components/shared/MaxAmountButton.tsx @@ -19,7 +19,7 @@ const MaxAmountButton = ({ }) => { return ( diff --git a/components/trade/AdvancedMarketHeader.tsx b/components/trade/AdvancedMarketHeader.tsx index 5a0ab0f7..e8729ebb 100644 --- a/components/trade/AdvancedMarketHeader.tsx +++ b/components/trade/AdvancedMarketHeader.tsx @@ -204,7 +204,7 @@ const AdvancedMarketHeader = ({
{selectedMarket instanceof PerpMarket ? ( setShowMarketDetails(true)} > diff --git a/components/trade/MarketCloseModal.tsx b/components/trade/MarketCloseModal.tsx index 877b5efa..e525717c 100644 --- a/components/trade/MarketCloseModal.tsx +++ b/components/trade/MarketCloseModal.tsx @@ -204,7 +204,7 @@ const MarketCloseModal: FunctionComponent = ({ {submitting ? : {t('trade:close-position')}} {t('cancel')} diff --git a/components/trade/PerpPositions.tsx b/components/trade/PerpPositions.tsx index edc12a0d..880e2abe 100644 --- a/components/trade/PerpPositions.tsx +++ b/components/trade/PerpPositions.tsx @@ -149,6 +149,7 @@ const PerpPositions = () => {

{isSelectedMarket ? ( handlePositionClick(floorBasePosition, market) } @@ -294,7 +295,7 @@ const PerpPositions = () => { {isSelectedMarket && asPath === '/trade' ? ( handlePositionClick(floorBasePosition, market) }