Remove border and update to Alpha 5

SporkDAOOfficial · Aug 21, 2023 · 44d3ce5 · 44d3ce5
1 parent c8e9397
commit 44d3ce5
Show file tree

Hide file tree

Showing 4 changed files with 741 additions and 1,310 deletions.
diff --git a/package.json b/package.json
@@ -12,16 +12,16 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@daohaus/connect": "^0.2.0-alpha.4",
-    "@daohaus/contract-utils": "^0.2.0-alpha.4",
-    "@daohaus/form-builder": "^0.2.0-alpha.4",
-    "@daohaus/tx-builder": "^0.2.0-alpha.4",
-    "@daohaus/ui": "^0.2.0-alpha.4",
-    "@daohaus/utils": "^0.2.0-alpha.4",
-    "@daohaus/moloch-v3-fields": "^0.2.0-alpha.4",
-    "@daohaus/moloch-v3-legos": "^0.2.0-alpha.4",
-    "@daohaus/moloch-v3-hooks": "^0.2.0-alpha.4",
-    "@daohaus/moloch-v3-macro-ui": "^0.2.0-alpha.4",
+    "@daohaus/connect": "^0.2.0-alpha.5",
+    "@daohaus/contract-utils": "^0.2.0-alpha.5",
+    "@daohaus/form-builder": "^0.2.0-alpha.5",
+    "@daohaus/tx-builder": "^0.2.0-alpha.5",
+    "@daohaus/ui": "^0.2.0-alpha.5",
+    "@daohaus/utils": "^0.2.0-alpha.5",
+    "@daohaus/moloch-v3-fields": "^0.2.0-alpha.5",
+    "@daohaus/moloch-v3-legos": "^0.2.0-alpha.5",
+    "@daohaus/moloch-v3-hooks": "^0.2.0-alpha.5",
+    "@daohaus/moloch-v3-macro-ui": "^0.2.0-alpha.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-query": "^3.39.3",

diff --git a/src/components/ButtonRouterLink.tsx b/src/components/ButtonRouterLink.tsx
@@ -1,14 +1,14 @@
-import React, { ComponentProps } from "react";
-import { Link as RouterLink } from "react-router-dom";
-import styled from "styled-components";
-import { Button } from "@daohaus/ui";
+import React, { ComponentProps } from 'react';
+import { Link as RouterLink } from 'react-router-dom';
+import styled from 'styled-components';
+import { Button } from '@daohaus/ui';
 
 type ProfileLinkProps = {
   href?: string;
   to: string;
   selected?: boolean;
   disabled?: boolean;
-  linkType?: "internal" | "external" | "no-icon-external";
+  linkType?: 'internal' | 'external' | 'no-icon-external';
   hideIcon?: boolean;
   target?: string;
   rel?: string;
@@ -17,7 +17,7 @@ type ProfileLinkProps = {
 const StyledRouterLink = styled(RouterLink)`
   text-decoration: none;
   color: unset;
-  :hover {
+  &:hover {
     text-decoration: none;
   }
 `;
@@ -33,7 +33,7 @@ export const ButtonRouterLink = ({
   ...buttonProps
 }: ProfileLinkProps) => {
   return (
-    <StyledRouterLink to={to} target={target} className="button-link" rel={rel}>
+    <StyledRouterLink to={to} target={target} className='button-link' rel={rel}>
       <Button disabled={disabled} {...buttonProps}>
         {children}
       </Button>

diff --git a/src/components/NewProposalList.tsx b/src/components/NewProposalList.tsx
@@ -1,9 +1,9 @@
-import { Link as RouterLink } from "react-router-dom";
-import { RiArrowRightSLine } from "react-icons/ri/index.js";
-import styled from "styled-components";
-import { Bold, border, DataSm, ParMd, Tabs, Theme } from "@daohaus/ui";
-import { CustomFormLego } from "../legos/fieldConfig";
-import { useCurrentDao } from "@daohaus/moloch-v3-hooks";
+import { Link as RouterLink } from 'react-router-dom';
+import { RiArrowRightSLine } from 'react-icons/ri/index.js';
+import styled from 'styled-components';
+import { Bold, DataSm, ParMd } from '@daohaus/ui';
+import { CustomFormLego } from '../legos/fieldConfig';
+import { useCurrentDao } from '@daohaus/moloch-v3-hooks';
 
 const ListContainer = styled.div`
   margin-top: 2.5rem;
@@ -12,15 +12,14 @@ const ListContainer = styled.div`
 const ListItemContainer = styled.div`
   width: 100%;
   padding: 1rem 0;
-  border-top: 1px ${({ theme }: { theme: Theme }) => theme.secondary.step6}
-    solid;
+  border-top: 1px ${({ theme }: { theme: any }) => theme.secondary.step6} solid;
 `;
 
 const ListItemLink = styled(RouterLink)`
   text-decoration: none;
   width: 100%;
   color: unset;
-  :hover {
+  &:hover {
     text-decoration: none;
   }
 `;
@@ -31,10 +30,10 @@ const ListItemHoverContainer = styled.div`
   align-items: center;
   width: 100%;
   padding: 1rem;
-  border-radius: ${border.radius};
+  border-radius: ${({ theme }: { theme: any }) => theme.card.border};
 
-  :hover {
-    background: 1px ${({ theme }: { theme: Theme }) => theme.secondary.step3};
+  &:hover {
+    background: 1px ${({ theme }: { theme: any }) => theme.secondary.step3};
   }
 `;
 
@@ -47,7 +46,7 @@ const ListItem = styled.div`
 `;
 
 const StyledIcon = styled(RiArrowRightSLine)`
-  fill: ${({ theme }: { theme: Theme }) => theme.primary.step9};
+  fill: ${({ theme }: { theme: any }) => theme.primary.step9};
   font-size: 3rem;
 `;