diff --git a/packages/components-faraday/src/components/AppBar/AppBar.js b/packages/components-faraday/src/components/AppBar/AppBar.js index d44fe4e4daef4ceec8afa4352f2c2bb8ac41755d..bec517e24e5a34899376ac65f81f62bcfc4f5ec9 100644 --- a/packages/components-faraday/src/components/AppBar/AppBar.js +++ b/packages/components-faraday/src/components/AppBar/AppBar.js @@ -1,9 +1,9 @@ import React from 'react' import { get } from 'lodash' -import { Icon } from '@pubsweet/ui' import { connect } from 'react-redux' -import styled, { withTheme } from 'styled-components' +import { Icon, th } from '@pubsweet/ui' import { withRouter } from 'react-router-dom' +import styled, { withTheme } from 'styled-components' import { withState, withHandlers, compose } from 'recompose' const AppBar = ({ @@ -51,8 +51,8 @@ const AppBar = ({ // #region styled-components const Root = styled.div` align-items: center; - box-shadow: ${props => props.theme.dropShadow}; - font-family: ${props => props.theme.fontInterface}; + box-shadow: ${th('dropShadow')}; + font-family: ${th('fontInterface')}; display: flex; justify-content: space-between; height: 60px; @@ -83,17 +83,16 @@ const User = styled.div` } & span { - color: ${props => props.theme.colorText}; - font-family: ${props => props.theme.fontHeading}; - font-size: ${props => props.theme.fontSizeBase}; + color: ${th('colorText')}; + font-family: ${th('fontHeading')}; + font-size: ${th('fontSizeBase')}; margin-left: 10px; } ` const Dropdown = styled.div` - background-color: ${props => props.theme.backgroundColor || '#fff'}; - border: ${({ theme }) => - `${theme.borderWidth} ${theme.borderStyle} ${theme.colorFurniture}`}; + background-color: ${th('colorBackground')}; + border: ${th('borderWidth')} ${th('borderStyle')} ${th('colorFurniture')}; position: absolute; min-width: 150px; right: 20px; @@ -103,18 +102,18 @@ const Dropdown = styled.div` const DropdownOption = styled.div` align-items: center; - color: ${props => props.theme.colorText}; + color: ${th('colorText')}; cursor: pointer; display: flex; justify-content: flex-start; height: 34px; - font-family: ${props => props.theme.fontInterface}; - font-size: ${props => props.theme.fontSizeBaseSmall}; - line-height: ${props => props.theme.fontLineHeight}; + font-family: ${th('fontInterface')}; + font-size: ${th('fontSizeBaseSmall')}; + line-height: ${th('fontLineHeight')}; padding: 0 15px; &:hover { - background-color: ${props => props.theme.colorTextReverse || '#d8d8d8'}; + background-color: ${th('backgroundColor')}; } ` diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js index 83eca23445e8db1f2750408de5c5115f7cccfe27..007ee79b890e6de705d5b8e1946d2311682920ed 100644 --- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js +++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js @@ -43,7 +43,7 @@ export default SignUpInvitation // #region styles const Root = styled.div` - max-width: 500px; + max-width: 550px; min-width: 300px; margin: 0 auto; display: flex;