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

fix: APP-383 align create project button #2568

Merged
merged 3 commits into from
Dec 11, 2024
Merged

fix: APP-383 align create project button #2568

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
e1f351c
fix: align create project button
r41ph Dec 9, 2024
d19b21b
fix: update style for when user is not logged in
r41ph Dec 9, 2024
630d6b7
fix: align language switcher
r41ph Dec 9, 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
2 changes: 1 addition & 1 deletion web-components/src/components/header/Header.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const useHeaderStyles = makeStyles<StyleProps>()(
},
'& li.MuiMenuItem-root, li.MuiMenuItem-root > div': {
display: 'flex',
alignSelf: 'end',
alignSelf: 'center',
backgroundColor: 'inherit',
textDecoration: 'none',
},
Expand Down
3 changes: 3 additions & 0 deletions web-components/src/components/header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface HeaderProps {
websiteExtras?: JSX.Element;
pathname?: string;
transparent?: boolean;
isUserLoggedIn?: boolean;
}

export default function Header({
Expand All @@ -48,6 +49,7 @@ export default function Header({
pathname = '/',
extras,
websiteExtras,
isUserLoggedIn,
}: HeaderProps): JSX.Element {
const theme = useTheme();
const isTablet = useMediaQuery(theme.breakpoints.down('md'));
Expand Down Expand Up @@ -107,6 +109,7 @@ export default function Header({
menuItems={menuItems}
extras={extras}
websiteExtras={websiteExtras}
isUserLoggedIn={isUserLoggedIn}
/>
</Box>
</Box>
Expand Down
5 changes: 3 additions & 2 deletions web-components/src/components/mobile-menu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type Props = {
extras?: JSX.Element;
linkComponent: React.FC<React.PropsWithChildren<NavLinkProps>>;
websiteExtras?: JSX.Element;
isUserLoggedIn?: boolean;
};

const MobileMenu: React.FC<React.PropsWithChildren<Props>> = ({
Expand All @@ -29,7 +30,7 @@ const MobileMenu: React.FC<React.PropsWithChildren<Props>> = ({
extras,
websiteExtras,
linkComponent: Link,
...props
isUserLoggedIn,
}) => {
const { classes: styles, cx } = useMobileMenuStyles();
const theme = useTheme();
Expand All @@ -52,7 +53,7 @@ const MobileMenu: React.FC<React.PropsWithChildren<Props>> = ({
onClick={handleOpen}
width="29px"
height="22px"
sx={{ ml: 4 }}
sx={{ ml: { xs: isUserLoggedIn ? 0 : 2, sm: 4 } }}
/>
</Center>
<Drawer
Expand Down
6 changes: 3 additions & 3 deletions web-marketplace/src/components/organisms/ListProject/ListProject.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ const ListProject = () => {
);

return (
<div>
<>
{!isLoadingIsIssuer && (
<Body
className="text-[11px] sm:text-base font-bold bg-clip-text cursor-pointer pt-[2px] pr-10 sm:pr-25 bg-[linear-gradient(202deg,#4FB573_14.67%,#B9E1C7_97.14%)]"
className="text-[11px] sm:text-base font-bold bg-clip-text cursor-pointer mb-3 pr-10 sm:pr-25 bg-[linear-gradient(202deg,#4FB573_14.67%,#B9E1C7_97.14%)] text-right"
sx={{
textFillColor: 'transparent',
}}
Expand All @@ -77,7 +77,7 @@ const ListProject = () => {
modalState={modalState}
redirectRoute="project-pages/draft/basic-info"
/>
</div>
</>
);
};

Expand Down
6 changes: 3 additions & 3 deletions web-marketplace/src/components/organisms/RegistryLayout/RegistryLayout.Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ const RegistryLayoutHeader: React.FC = () => {
const { _ } = useLingui();
const { pathname } = useLocation();
const { activeAccount, privActiveAccount } = useAuth();

const { wallet, disconnect, isConnected, loginDisabled } = useWallet();
const { accountOrWallet } = useAuthData();
const { accountOrWallet, noAccountAndNoWallet } = useAuthData();
const theme = useTheme<Theme>();
const headerColors = useMemo(() => getHeaderColors(theme), [theme]);
const isTransparent = useMemo(() => getIsTransparent(pathname), [pathname]);
Expand Down Expand Up @@ -134,7 +133,7 @@ const RegistryLayoutHeader: React.FC = () => {
{clientConfig.listProject && <ListProject />}
<LanguageSwitcher
className={cn(
'mr-25 hidden lg:block',
'mr-25 mt-1 hidden lg:block',
isHome && 'text-sc-button-text-icon-light',
)}
/>
Expand All @@ -161,6 +160,7 @@ const RegistryLayoutHeader: React.FC = () => {
{clientConfig.loginButton && <LoginButton />}
</Box>
}
isUserLoggedIn={!noAccountAndNoWallet}
/>
</>
);
Expand Down
Loading