From 791041583725a32f0e683434b98aed6b71d66c01 Mon Sep 17 00:00:00 2001
From: Demetriad Sinzeanu <demetriad.sinzeanu@thinslices.com>
Date: Thu, 20 Dec 2018 13:34:56 +0200
Subject: [PATCH] style(ActionLink/ManuscriptCard): Changes made for Delete
button functionality and css changes made
---
packages/component-faraday-ui/src/ActionLink.js | 11 +++++------
packages/component-faraday-ui/src/ManuscriptCard.js | 4 ++--
.../src/manuscriptDetails/DeleteManuscriptModal.js | 7 +++++--
.../component-user/app/components/OpenUserForm.js | 8 +-------
.../src/components/SubmissionWizard.js | 13 ++-----------
5 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/packages/component-faraday-ui/src/ActionLink.js b/packages/component-faraday-ui/src/ActionLink.js
index 7da088b7f..84f827ac4 100644
--- a/packages/component-faraday-ui/src/ActionLink.js
+++ b/packages/component-faraday-ui/src/ActionLink.js
@@ -34,6 +34,7 @@ const ActionLink = ({
(iconPosition === 'left' && (
<FontIconButton
className={`${fontIcon} fontIconStyle`}
+ onClick={onClick}
paddingBottom={paddingBottom}
paddingRight={paddingRight}
size={size}
@@ -50,6 +51,7 @@ const ActionLink = ({
(iconPosition === 'right' && (
<FontIconButton
className={`${fontIcon} fontIconStyle`}
+ onClick={onClick}
paddingBottom={paddingBottom}
paddingRight={paddingRight}
size={size}
@@ -109,12 +111,6 @@ const ExternalLink = styled.a`
color: ${th('colorSecondary')};
font-family: ${th('fontReading')};
text-decoration: underline;
-
- &:hover {
- color: ${th('colorSecondary')};
- font-family: ${th('fontReading')};
- text-decoration: underline;
- }
`
const CustomLink = ExternalLink.withComponent(Link)
@@ -122,6 +118,9 @@ const Root = styled.div`
align-items: center;
justify-content: center;
display: ${props => (props.to ? 'inline-flex' : 'flex')};
+ &:hover * {
+ color: ${th('colorSecondary')};
+ }
${marginHelper};
${paddingHelper};
diff --git a/packages/component-faraday-ui/src/ManuscriptCard.js b/packages/component-faraday-ui/src/ManuscriptCard.js
index d3d837301..7206f71ed 100644
--- a/packages/component-faraday-ui/src/ManuscriptCard.js
+++ b/packages/component-faraday-ui/src/ManuscriptCard.js
@@ -99,7 +99,7 @@ const ManuscriptCard = ({
<DeleteIcon
fontIcon="deleteIcon"
onClick={showModal}
- paddingBottom={2}
+ paddingBottom={1}
paddingRight={0}
size={1.65}
>
@@ -122,7 +122,7 @@ const ManuscriptCard = ({
</Row>
</MainContainer>
<SideNavigation>
- <IconButton fontIcon="arrowRight" iconSize={2} pl={0.4} />
+ <IconButton fontIcon="arrowRight" iconSize={2} pl={0.2} />
</SideNavigation>
</Root>
)
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js b/packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js
index 9ee27678a..9160fed05 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js
@@ -75,7 +75,7 @@ const DeleteManuscriptModal = props => (
<DeleteIcon
fontIcon="deleteIcon"
onClick={showModal}
- paddingBottom={2}
+ paddingBottom={1}
paddingRight={0}
size={1.65}
>
@@ -94,7 +94,10 @@ DeleteManuscriptModal.defaultProps = {
}
// #region styles
-const DeleteIcon = styled(ActionLink)``
+const DeleteIcon = styled(ActionLink)`
+ cursor: default;
+ color: ${th('colorWarning')};
+`
const Root = styled.div`
align-items: center;
background: ${th('colorBackgroundHue')};
diff --git a/packages/component-user/app/components/OpenUserForm.js b/packages/component-user/app/components/OpenUserForm.js
index 985c02360..6c82000ba 100644
--- a/packages/component-user/app/components/OpenUserForm.js
+++ b/packages/component-user/app/components/OpenUserForm.js
@@ -18,13 +18,7 @@ const OpenUserForm = ({ edit, user, onSubmit, modalKey }) => (
>
{showModal =>
edit ? (
- <IconButton
- fontIcon="editIcon"
- iconSize={2}
- onClick={showModal}
- paddingBottom={1.5}
- pt={1 / 2}
- />
+ <IconButton fontIcon="editIcon" iconSize={2} onClick={showModal} />
) : (
<ActionLink icon="plus" onClick={showModal}>
ADD USER
diff --git a/packages/component-wizard/src/components/SubmissionWizard.js b/packages/component-wizard/src/components/SubmissionWizard.js
index 05541ef45..018ee6968 100644
--- a/packages/component-wizard/src/components/SubmissionWizard.js
+++ b/packages/component-wizard/src/components/SubmissionWizard.js
@@ -89,12 +89,7 @@ const Wizard = ({
mr={1}
onClick={isFirstStep ? history.goBack : prevStep}
>
- <IconButton
- fontIcon="arrowLeft"
- mb={0.1}
- paddingBottom={1.2}
- paddingRight={0.9}
- />
+ <IconButton fontIcon="arrowLeft" mb={0.1} pb={0.3} />
Back
</Button>
<Button
@@ -104,11 +99,7 @@ const Wizard = ({
primary
>
{getButtonText()}
- <IconButton
- fontIcon="arrowRight"
- mb={0.1}
- paddingBottom={0.5}
- />
+ <IconButton fontIcon="arrowRight" mb={0.1} pb={0.1} />
</Button>
</Fragment>
)}
--
GitLab