合并冲突

public/locales/zh-CN.json

@@ -1127,9 +1127,6 @@
   "capital pool": "资金池",
   "Unclaimed income": "待领取收益",
   "pledge": "质押",
-<<<<<<< HEAD
+  "Invite": "邀请",
   "top": "置顶"
-=======
-  "Invite": "邀请"
->>>>>>> dev
 }

src/views/Board/components/BoardCard/BoardCard.tsx

@@ -85,6 +85,9 @@ const CardDiv = styled.div`
   flex-direction: column;
   justify-content: space-around;
 `
+const ContentDiv = styled.div`
+  padding: 0 20px;
+`
 
 interface NodeCardProps {
   board: any
@@ -123,18 +126,20 @@ const BoardCard: React.FC<NodeCardProps> = ({ board, account }) => {
   return (
     <FCard>
       <CardHeading name={t(board.name)} img={board.img} tokenSymbol={board.tokenSymbol} />
-      {account && (
-        <div>
-          <FlexText name={t('HCC Currency amount')} value={board.userData?.amount} />
-          {board.userData?.name === 'Board' ? (
-            <FlexText name={t('Lock up time')} value={board.userData?.unlockTime} />
-          ) : (
-            ''
-          )}
-          <FlexText name={t('possess LP')} value={board.userData?.rewardDebt} />
-        </div>
-      )}
-      <CardActionsContainer board={board} account={account} />
+      <ContentDiv>
+        {account && (
+          <div>
+            <FlexText name={t('HCC Currency amount')} value={board.userData?.amount} />
+            {board.userData?.name === 'Board' ? (
+              <FlexText name={t('Lock up time')} value={board.userData?.unlockTime} />
+            ) : (
+              ''
+            )}
+            <FlexText name={t('possess LP')} value={board.userData?.rewardDebt} />
+          </div>
+        )}
+        <CardActionsContainer board={board} account={account} />
+      </ContentDiv>
       {/* <Divider />
       <ExpandableSectionButton
         onClick={() => setShowExpandableSection(!showExpandableSection)}