Merge pull request #46 from marvinmarnold/patch02

🐛 Fix: Ui updated
marvinmarnold · Aug 18, 2023 · e284e39 · e284e39
2 parents 13ae83b + 38ca9f3
commit e284e39
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/components/ApproveCampaign.tsx b/src/components/ApproveCampaign.tsx
@@ -82,7 +82,7 @@ const ApproveCampaign = ({
    </Heading>
    {!writeSuccess && (
     <>
-     <Text as="h5" fontSize="xl" marginY={10}>
+     <Text as="h5" fontSize="xl" marginY={10} fontFamily="Dm Sans" textAlign="center">
       You need to approve the campaign contract
       <br />
       to distribute awards on your behalf.

diff --git a/src/components/layout/SuccessComponent.tsx b/src/components/layout/SuccessComponent.tsx
@@ -17,14 +17,14 @@ const SuccessComponent = ({ link, data, message = '', subtitle = '' }: { link: s
 
  return (
   <Box margin={10} top="64px" textAlign="center">
-   <Heading as="h3" size="xl" textAlign="center" margin={5}>
+   <Heading as="h3" size="xl" textAlign="center" margin={5} fontFamily="Dm Sans">
     {message}
    </Heading>
    {link ? (
     <Box>
      <Box margin={5}>
       <a href={link}>
-       <Heading as="h4" size="md">
+       <Heading as="h4" size="md" fontFamily="Dm Sans">
         {subtitle}
        </Heading>
       </a>
@@ -40,7 +40,7 @@ const SuccessComponent = ({ link, data, message = '', subtitle = '' }: { link: s
          boxShadow={'2.8px 3.8px 0px 0px #312E2A'}
          py={2}
          px={12}
-         fontFamily="sans-serif"
+         fontFamily="Dm Sans"
          color="white"
          type="submit">
          <Icon as={FiCopy} margin="0 5px" /> Copy to clipboard
@@ -57,7 +57,7 @@ const SuccessComponent = ({ link, data, message = '', subtitle = '' }: { link: s
     </Box>
    )}
 
-   <Box margin="5">
+   <Box margin="5" fontFamily="Dm Sans">
     <Button variant="link">
      {/* <a href={`https://etherscan.io/tx/${data?.hash}`}> */}
      <a target="_blank" href={`https://goerli-optimism.etherscan.io/tx/${data?.hash}#eventlog`}>

diff --git a/src/pages/CreateCampaign.tsx b/src/pages/CreateCampaign.tsx
@@ -130,7 +130,7 @@ const CreateCampaign = () => {
   <Container>
    <Background />
 
-   <Box position="absolute" top="64px" display="flex" justifyContent="center">
+   <Box display="flex" justifyContent="center">
     {!isConnected && (
      <Heading textAlign="center" justifyContent="center" marginTop="60%">
       Please Connect Your Wallet!

diff --git a/src/pages/CreateCrossCampaign.tsx b/src/pages/CreateCrossCampaign.tsx
@@ -213,7 +213,7 @@ const CreateCrossCampaign = () => {
   <Container>
    <Background />
 
-   <Box position="absolute" top="64px" display="flex" justifyContent="center">
+   <Box display="flex" justifyContent="center">
     {!isConnected && (
      <Heading textAlign="center" justifyContent="center" marginTop="60%">
       Please Connect Your Wallet!
@@ -303,9 +303,12 @@ const CreateCrossCampaign = () => {
          Create Cross Campaign
         </Heading>
 
-        <h1>
-         <a target="_blank" href="https://docs.google.com/document/d/1Gym0FotIM5yJcoiAEbiIk4mdie7tpymfIsXqO_FahDs/edit?usp=sharing">
-          Follow the tutorial here.
+        <h1 style={{ display: 'flex', justifyContent: 'center' }}>
+         <a
+          style={{ textAlign: 'center', fontFamily: 'Dm Sans' }}
+          target="_blank"
+          href="https://docs.google.com/document/d/1Gym0FotIM5yJcoiAEbiIk4mdie7tpymfIsXqO_FahDs/edit?usp=sharing">
+          Follow the tutorial here.👈
          </a>
         </h1>
 

diff --git a/src/pages/createlink.tsx b/src/pages/createlink.tsx
@@ -198,7 +198,7 @@ const CreateLink: NextPage = () => {
   )
 
  return (
-  <Container>
+  <Container overflowY={'hidden'}>
    <Background />
    {!isConnected && (
     <Heading textAlign="center" justifyContent="center" mb={40}>
@@ -234,7 +234,7 @@ const CreateLink: NextPage = () => {
       {!campaignAddress ? (
        <CampaignsMenu selectedCampaign={selectedCampaign} setSelectedCampaign={setSelectedCampaign} isActive={proof?.length === 0} />
       ) : (
-       <div>Campaign: {actionId}</div>
+       <div style={{ fontFamily: 'Dm Sans', textAlign: 'center' }}>Campaign: {actionId}</div>
       )}
 
       <Box display="flex" justifyContent="center" mt={5}>

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -124,7 +124,9 @@ export default function Home() {
         h="150px"
         borderLeft="2px solid black"
         borderTop="0.1px solid black"
+        borderRight="2px solid black"
         borderTopLeftRadius="50px"
+        borderTopRightRadius="50px"
         flexDirection="column"
         justifyContent="center"
         alignItems="center">