diff --git a/packages/component-faraday-ui/src/ActionLink.js b/packages/component-faraday-ui/src/ActionLink.js index 7da088b7f4222acd69206dd116a2e9ae64583ae5..84f827ac4634f5a48d9fe3414033b607198a49eb 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 d3d8373014192d140a96096d06e6e7068aa0a9c9..7206f71edf925cad2e361b245946c81816d04d9e 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 9ee27678af282f846b99978396b7f65d1cddd86e..9160fed058fd58d5b13b6fff203a3a24b9e76096 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 985c02360c081f1f71128f3c398baa6d57e473bd..6c82000bad018537147c5ca903bf1e7ae6973d08 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 05541ef452a0167ab5f3d35daa3d4f193dd83462..018ee6968b765eac3100510ca8612754f95e5673 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> )}