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.

Sign up for GitHub

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

Jump to bottom

fix(APP-3648): Connect buttons, explorer layout margin #1410

Merged
merged 3 commits into from
Oct 29, 2024
Merged

fix(APP-3648): Connect buttons, explorer layout margin #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
537e742
fix: connect buttons, explorer layout margin
thekidnamedkd Oct 29, 2024
49f5882
chore: resolve merge conflicts
thekidnamedkd Oct 29, 2024
cf4b98f
chore: add responsive adjustment for explorer section
thekidnamedkd Oct 29, 2024
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: 4 additions & 2 deletions src/@aragon/ods-old/components/button/buttonWallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ type AvatarProps = Pick<ButtonWalletProps, 'isLoading' | 'isConnected' | 'src'>;

const Avatar: FC<AvatarProps> = ({isConnected, isLoading, src}) => {
if (!isConnected) {
return <Icon icon={IconType.PERSON} />;
return (
<Icon size="lg" responsiveSize={{md: 'md'}} icon={IconType.PERSON} />
);
}
if (isLoading) {
return <Spinner size="small" />;
Expand All @@ -59,7 +61,7 @@ const StyledButton = styled.button.attrs<StyledButtonProp>(({isLoading}) => {
isLoading ? 'text-primary-500' : 'text-neutral-600'
} flex items-center md:space-x-3 font-semibold p-3 hover:text-neutral-800
active:text-neutral-800 disabled:text-neutral-300 bg-neutral-0 hover:bg-neutral-100 active:bg-neutral-200
disabled:bg-neutral-100 rounded-xl focus-visible:ring focus-visible:ring-primary`;
disabled:bg-neutral-100 rounded-xl focus-visible:ring focus-visible:ring-primary size-12 justify-center md:w-fit`;
return {className};
})``;

Expand Down
2 changes: 1 addition & 1 deletion src/containers/daoExplorer/daoExplorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const DaoExplorer = () => {
});

const buttonGroupContainerClassName = classNames('shrink-0', {
'flex w-full md:w-fit justify-end': filters.quickFilter === 'featuredDaos',
'flex w-full md:w-fit': filters.quickFilter === 'featuredDaos',
'flex gap-x-3 w-full md:w-fit justify-between':
isConnected && filters.quickFilter !== 'featuredDaos',
});
Expand Down
4 changes: 0 additions & 4 deletions src/containers/navbar/exploreNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ const ExploreNav: React.FC = () => {
<ActionsWrapper>
{isDesktop ? (
<Button
size="md"
responsiveSize={{md: 'lg'}}
variant="tertiary"
iconRight={IconType.FEEDBACK}
onClick={handleFeedbackButtonClick}
Expand All @@ -83,8 +81,6 @@ const ExploreNav: React.FC = () => {
</Button>
) : (
<Button
size="md"
responsiveSize={{md: 'lg'}}
variant="tertiary"
iconLeft={IconType.FEEDBACK}
onClick={handleFeedbackButtonClick}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/explore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ export const Explore: React.FC = () => {

const ContentWrapper = styled.div.attrs({
className:
'col-span-full xl:col-start-2 xl:col-end-12 space-y-10 xl:space-y-16 mb-12 xl:mb-20',
'col-span-full xl:col-start-2 xl:col-end-12 space-y-10 xl:space-y-16 my-6 xl:my-12 xl:mb-20',
})``;
Loading