From bb846baa71e1a924db49e0994c6cf8a7e79f153b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 26 Jul 2020 18:00:17 +0200
Subject: [PATCH] Slight button ordering adjustments (#3271)

---
 packages/page-council/src/Overview/Vote.tsx       | 1 +
 packages/page-council/src/Overview/index.tsx      | 2 +-
 packages/page-treasury/src/Overview/TipCreate.tsx | 2 +-
 packages/page-treasury/src/Overview/index.tsx     | 2 +-
 packages/react-components/src/Button/Group.tsx    | 4 ++++
 packages/react-components/src/Table/Body.tsx      | 4 ++++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/page-council/src/Overview/Vote.tsx b/packages/page-council/src/Overview/Vote.tsx
index a177050336..f446817fd8 100644
--- a/packages/page-council/src/Overview/Vote.tsx
+++ b/packages/page-council/src/Overview/Vote.tsx
@@ -112,6 +112,7 @@ function Vote ({ electionsInfo }: Props): React.ReactElement<Props> {
             <TxButton
               accountId={accountId}
               isDisabled={!accountId || votes.length === 0 || voteValue.lten(0)}
+              label={t<string>('Vote')}
               onStart={toggleVisible}
               params={[votes, voteValue]}
               tx={
diff --git a/packages/page-council/src/Overview/index.tsx b/packages/page-council/src/Overview/index.tsx
index c91490feda..458a06a5d9 100644
--- a/packages/page-council/src/Overview/index.tsx
+++ b/packages/page-council/src/Overview/index.tsx
@@ -51,8 +51,8 @@ function Overview ({ className = '', prime }: Props): React.ReactElement<Props>
         electionsInfo={electionsInfo}
       />
       <Button.Group>
-        <SubmitCandidacy electionsInfo={electionsInfo} />
         <Vote electionsInfo={electionsInfo} />
+        <SubmitCandidacy electionsInfo={electionsInfo} />
       </Button.Group>
       <Members
         allVotes={allVotes}
diff --git a/packages/page-treasury/src/Overview/TipCreate.tsx b/packages/page-treasury/src/Overview/TipCreate.tsx
index 82e93eb777..47ee76397b 100644
--- a/packages/page-treasury/src/Overview/TipCreate.tsx
+++ b/packages/page-treasury/src/Overview/TipCreate.tsx
@@ -40,7 +40,7 @@ function TipCreate ({ members, refresh }: Props): React.ReactElement<Props> {
     <>
       <Button
         icon='plus'
-        label={t<string>('Tip')}
+        label={t<string>('Propose tip')}
         onClick={toggleOpen}
       />
       {isOpen && (
diff --git a/packages/page-treasury/src/Overview/index.tsx b/packages/page-treasury/src/Overview/index.tsx
index a5fa9fe45e..a7507f4cbb 100644
--- a/packages/page-treasury/src/Overview/index.tsx
+++ b/packages/page-treasury/src/Overview/index.tsx
@@ -41,11 +41,11 @@ function Overview ({ className }: Props): React.ReactElement<Props> {
         proposalCount={info?.proposals.length}
       />
       <Button.Group>
-        <ProposalCreate />
         <TipCreate
           members={members}
           refresh={triggerTipHashes}
         />
+        <ProposalCreate />
       </Button.Group>
       <Proposals
         isMember={isMember}
diff --git a/packages/react-components/src/Button/Group.tsx b/packages/react-components/src/Button/Group.tsx
index 6b4729c1df..09a7053313 100644
--- a/packages/react-components/src/Button/Group.tsx
+++ b/packages/react-components/src/Button/Group.tsx
@@ -30,4 +30,8 @@ export default React.memo(styled(ButtonGroup)`
   &+.ui--Table {
     margin-top: 1.5rem;
   }
+
+  .ui--Button {
+    margin: 0 0.25rem;
+  }
 `);
diff --git a/packages/react-components/src/Table/Body.tsx b/packages/react-components/src/Table/Body.tsx
index 3e210f55ba..39b655a4d2 100644
--- a/packages/react-components/src/Table/Body.tsx
+++ b/packages/react-components/src/Table/Body.tsx
@@ -131,6 +131,10 @@ export default React.memo(styled(Body)`
     &.favorite .ui--Icon.isSelected {
       color: darkorange;
     }
+
+    .ui--Button-Group .ui--Button {
+      margin: 0;
+    }
   }
 
   tr {