From a3b4eaa551124fdd42b658edb08801cf5270f0a8 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 25 Jul 2020 09:55:49 +0200
Subject: [PATCH] Update button styling (#3264)

* Update button styling

* Basic button

* Slight button background

* Disabled no background

* Las tweaks
---
 .../page-accounts/src/Sidebar/Sidebar.tsx     |  2 +-
 .../react-components/src/Button/Button.tsx    | 34 +++++++++---------
 .../react-components/src/Button/Group.tsx     | 14 --------
 packages/react-components/src/Table/Body.tsx  |  2 +-
 packages/react-components/src/styles/index.ts | 35 +++++++++++++------
 packages/react-components/src/styles/theme.ts | 15 ++------
 6 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/packages/page-accounts/src/Sidebar/Sidebar.tsx b/packages/page-accounts/src/Sidebar/Sidebar.tsx
index 983859c784..dc5795ac9d 100644
--- a/packages/page-accounts/src/Sidebar/Sidebar.tsx
+++ b/packages/page-accounts/src/Sidebar/Sidebar.tsx
@@ -110,7 +110,7 @@ function Sidebar ({ address, className = '', onClose, onUpdateName }: Props): Re
           <Button.Group>
             <Button
               icon='paper-plane'
-              label={t<string>('send')}
+              label={t<string>('Send')}
               onClick={toggleIsTransferOpen}
             />
             {flags.isOwned && (
diff --git a/packages/react-components/src/Button/Button.tsx b/packages/react-components/src/Button/Button.tsx
index 980dba85e3..8d90a5b4e3 100644
--- a/packages/react-components/src/Button/Button.tsx
+++ b/packages/react-components/src/Button/Button.tsx
@@ -10,6 +10,7 @@ import styled from 'styled-components';
 import Icon from '../Icon';
 import Spinner from '../Spinner';
 
+// iBasic, isPrimary, isPosition, isNegative - here for old compat, check, remove
 function Button ({ children, className = '', icon, isBasic, isBusy, isCircular, isDisabled, isFull, isIcon, isNegative, isPositive, isPrimary, label, onClick, onMouseEnter, onMouseLeave, tabIndex }: ButtonProps): React.ReactElement<ButtonProps> {
   const _onClick = useCallback(
     () => !(isBusy || isDisabled) && onClick && onClick(),
@@ -18,7 +19,7 @@ function Button ({ children, className = '', icon, isBasic, isBusy, isCircular,
 
   return (
     <button
-      className={`ui--Button${label ? ' hasLabel' : ''}${isBasic ? ' isBasic' : ''}${isCircular ? ' isCircular' : ''}${isFull ? ' isFull' : ''}${isIcon ? ' isIcon' : ''}${isNegative ? ' isNegative' : ''}${isPositive ? ' isPositive' : ''}${isPrimary ? (isBasic ? ' ui--highlight--border' : ' ui--highlight--button') : ''}${isDisabled ? ' isDisabled' : ''}${isBusy ? ' isBusy' : ''} ${className}`}
+      className={`ui--Button${label ? ' hasLabel' : ''}${isBasic ? ' isBasic' : ''}${isCircular ? ' isCircular' : ''}${isFull ? ' isFull' : ''}${isIcon ? ' isIcon' : ''}${isNegative ? ' isNegative' : ''}${isPositive ? ' isPositive' : ''}${isPrimary ? ' isPrimary' : ''}${(isBusy || isDisabled) ? ' isDisabled' : ''}${isBusy ? ' isBusy' : ''}${!onClick ? ' isReadOnly' : ''} ${className}`}
       onClick={_onClick}
       onMouseEnter={onMouseEnter}
       onMouseLeave={onMouseLeave}
@@ -38,14 +39,18 @@ function Button ({ children, className = '', icon, isBasic, isBusy, isCircular,
 }
 
 export default React.memo(styled(Button)`
+  background: #e9e8e7; // similar to rgba(0, 0, 0, 0.05);
   border: none;
+  color: #4e4e4e;
   cursor: pointer;
-  font-size: 0.92857142857rem; // 13/14px
+  // font-size: 0.92857142857rem; // 13/14px
+  margin: 0 1px;
   position: relative;
   text-align: center;
+  // text-shadow: 0 0 2px #f5f4f3;
 
   &:not(.hasLabel) {
-    padding: 0.75em;
+    padding: 0.7em;
 
     > .ui--Icon {
       height: 1rem;
@@ -62,31 +67,27 @@ export default React.memo(styled(Button)`
   }
 
   &.hasLabel {
-    padding: 0.75em 1.5em;
+    padding: 0.7em 1.3em;
 
     > .ui--Icon {
       margin-right: 0.75rem;
     }
   }
 
-  &.isBasic {
-    background: white !important;
-    box-shadow: 0 0 0 1px #ddd;
-    color: inherit !important;
-  }
-
-  &.isBusy {
-    cursor: wait;
-  }
-
   &.isCircular {
     border-radius: 10rem;
   }
 
-  &.isDisabled {
+  &.isDisabled, &.isReadOnly {
+    background: none;
+    box-shadow: none;
     cursor: not-allowed;
   }
 
+  &.isBusy {
+    cursor: wait;
+  }
+
   &.isFull {
     display: block;
     width: 100%;
@@ -101,7 +102,7 @@ export default React.memo(styled(Button)`
   }
 
   .ui--Button-overlay {
-    background: rgba(255, 255, 255, 0.75);
+    background: rgba(245, 244, 243, 0.75);
     bottom: 0;
     left: 0;
     position: absolute;
@@ -116,7 +117,6 @@ export default React.memo(styled(Button)`
     }
   }
 
-  &.isBusy,
   &.isDisabled {
     .ui--Button-overlay {
       visibility: visible;
diff --git a/packages/react-components/src/Button/Group.tsx b/packages/react-components/src/Button/Group.tsx
index e7f0fbc397..6b4729c1df 100644
--- a/packages/react-components/src/Button/Group.tsx
+++ b/packages/react-components/src/Button/Group.tsx
@@ -30,18 +30,4 @@ export default React.memo(styled(ButtonGroup)`
   &+.ui--Table {
     margin-top: 1.5rem;
   }
-
-  .ui--Button {
-    margin-left: 1px !important;
-
-    &:not(:first-of-type) {
-      border-bottom-left-radius: 0rem !important;
-      border-top-left-radius: 0rem !important;
-    }
-
-    &:not(:last-of-type) {
-      border-bottom-right-radius: 0 !important;
-      border-top-right-radius: 0 !important;
-    }
-  }
 `);
diff --git a/packages/react-components/src/Table/Body.tsx b/packages/react-components/src/Table/Body.tsx
index 6f7e034e35..3e210f55ba 100644
--- a/packages/react-components/src/Table/Body.tsx
+++ b/packages/react-components/src/Table/Body.tsx
@@ -169,7 +169,7 @@ export default React.memo(styled(Body)`
     .ui--Button:not(.isIcon):not(:hover) {
       background: transparent !important;
       box-shadow: none !important;
-      color: #555 !important;
+      // color: #555 !important;
     }
 
     .ui.toggle.checkbox input:checked~.box:before,
diff --git a/packages/react-components/src/styles/index.ts b/packages/react-components/src/styles/index.ts
index fe4326e066..12949a5982 100644
--- a/packages/react-components/src/styles/index.ts
+++ b/packages/react-components/src/styles/index.ts
@@ -27,6 +27,10 @@ export default createGlobalStyle<Props>`
     color: ${getHighlight} !important;
   }
 
+  .ui--highlight--before:before {
+    background: ${getHighlight} !important;
+  }
+
   .ui--highlight--bg {
     background: ${getHighlight} !important;
   }
@@ -35,15 +39,6 @@ export default createGlobalStyle<Props>`
     border-color: ${getHighlight} !important;
   }
 
-  .ui--highlight--button {
-    background: ${getHighlight} !important;
-    // box-shadow: 0 0 0 1px ${getHighlight} !important;
-
-    &:hover {
-      // box-shadow: inherit !important;
-    }
-  }
-
   .ui--highlight--color {
     color: ${getHighlight} !important;
   }
@@ -53,7 +48,7 @@ export default createGlobalStyle<Props>`
   }
 
   .ui--highlight--gradient {
-    background: ${(props: Props): string => `linear-gradient(90deg, ${props.uiHighlight || defaultHighlight}, transparent)`};
+    background: ${(props: Props) => `linear-gradient(90deg, ${props.uiHighlight || defaultHighlight}, transparent)`};
   }
 
   .ui--highlight--icon {
@@ -66,6 +61,26 @@ export default createGlobalStyle<Props>`
     stroke: ${getHighlight} !important;
   }
 
+  .ui--Button {
+    &:not(.isDisabled):not(.isIcon) {
+      .ui--Icon {
+        color: ${getHighlight};
+      }
+    }
+
+    &:hover:not(.isDisabled):not(.isReadOnly) {
+      background: ${getHighlight};
+      color: #f5f5f4;
+      text-shadow: none;
+
+      &:not(.isIcon) {
+        .ui--Icon {
+          color: inherit;
+        }
+      }
+    }
+  }
+
   .theme--default {
     .ui--Tabs-Tab.tabLinkActive {
       border-bottom-color: ${getHighlight};
diff --git a/packages/react-components/src/styles/theme.ts b/packages/react-components/src/styles/theme.ts
index 0d89884876..4a92f3fc15 100644
--- a/packages/react-components/src/styles/theme.ts
+++ b/packages/react-components/src/styles/theme.ts
@@ -32,22 +32,11 @@ export default css`
     }
 
     .ui--Button {
-      background-color: ${colorBtnDefault};
-      color: ${colorBtnText};
-
-      &.active,
-      &:active,
-      &:focus,
-      &:hover {
-        background-color: ${colorBtnDefault};
-        color: ${colorBtnText};
-      }
-
-      &:hover {
+      &:hover:not(.isDisabled) {
         filter: brightness(110%);
       }
 
-      &.isIcon {
+      &.isIcon:not(.isDisabled) {
         .ui--Icon {
           color: ${colorLink};
         }