Skip to content
Snippets Groups Projects
Commit 5bf7b589 authored by Jure's avatar Jure
Browse files

fix: small styling improvements

parent 5baba69f
No related branches found
No related tags found
No related merge requests found
import React from 'react' import React from 'react'
import styled, { css } from 'styled-components' import styled, { css } from 'styled-components'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { override, th, grid } from '@pubsweet/ui-toolkit' import { override, th, grid, darken } from '@pubsweet/ui-toolkit'
import { Icon, Action } from '@pubsweet/ui' import { Icon, Action } from '@pubsweet/ui'
import { UserAvatar } from '../components/component-avatar/src' import { UserAvatar } from '../components/component-avatar/src'
...@@ -46,18 +46,26 @@ const NavItem = ({ className, link, name, icon }) => ( ...@@ -46,18 +46,26 @@ const NavItem = ({ className, link, name, icon }) => (
const Item = styled(NavItem)` const Item = styled(NavItem)`
border-radius: 10px; border-radius: 10px;
padding-left: ${grid(1)};
height: ${grid(5)}; height: ${grid(5)};
line-height: ${grid(3)}; line-height: ${grid(3)};
display: flex; display: flex;
align-items: center; align-items: center;
color: ${th('colorSecondary')}; color: ${darken('colorSecondary', 0.5)};
&:hover { &:hover {
color: ${th('colorText')};
stroke: ${th('colorText')};
background-color: ${th('colorBackgroundHue')}; background-color: ${th('colorBackgroundHue')};
} }
svg { svg {
&:hover {
}
width: 1em; width: 1em;
stroke: ${darken('colorSecondary', 0.5)};
} }
${props => ${props =>
...@@ -65,6 +73,11 @@ const Item = styled(NavItem)` ...@@ -65,6 +73,11 @@ const Item = styled(NavItem)`
css` css`
background-color: ${th('colorFurniture')}; background-color: ${th('colorFurniture')};
color: ${th('colorText')}; color: ${th('colorText')};
&:hover {
background-color: ${th('colorFurniture')};
color: ${th('colorText')};
}
`} `}
// align-items: center; // align-items: center;
// display: inline-flex; // display: inline-flex;
......
...@@ -122,8 +122,8 @@ export const ChatInputWrapper = styled.div` ...@@ -122,8 +122,8 @@ export const ChatInputWrapper = styled.div`
margin-bottom: ${th('gridUnit')}; margin-bottom: ${th('gridUnit')};
padding: 8px 12px 0 12px; padding: 8px 12px 0 12px;
background-color: ${th('colorBackground')}; background-color: ${th('colorBackground')};
border-top: 1px solid ${th('colorBorder')}; // border-top: 1px solid ${th('colorBorder')};
box-shadow: -1px 0 0 ${th('colorBorder')}, 1px 0 0 ${th('colorBorder')}; // box-shadow: -1px 0 0 ${th('colorBorder')}, 1px 0 0 ${th('colorBorder')};
@media (max-width: ${MEDIA_BREAK}px) { @media (max-width: ${MEDIA_BREAK}px) {
bottom: ${props => (props.focus ? '0' : 'auto')}; bottom: ${props => (props.focus ? '0' : 'auto')};
position: relative; position: relative;
......
import React from 'react' import React from 'react'
import styled from 'styled-components' import styled from 'styled-components'
// import { th } from '@pubsweet/ui-toolkit' import { th } from '@pubsweet/ui-toolkit'
// import { useQuery } from '@apollo/react-hooks' // import { useQuery } from '@apollo/react-hooks'
// import gql from 'graphql-tag' // import gql from 'graphql-tag'
// import { useParams } from 'react-router-dom' // import { useParams } from 'react-router-dom'
...@@ -10,10 +10,8 @@ import ChatInput from './SuperChatInput/SuperChatInput' ...@@ -10,10 +10,8 @@ import ChatInput from './SuperChatInput/SuperChatInput'
const MessageContainer = styled.section` const MessageContainer = styled.section`
display: grid; display: grid;
min-width: 100%; min-width: 100%;
// flex-direction: column;
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
// height: calc(100vh - 64px); grid-template-rows: 1fr calc(${th('gridUnit')} * 8);
// grid-template-rows: calc(100% - 40px);
grid-template-areas: grid-template-areas:
'read' 'read'
'write'; 'write';
......
...@@ -16,11 +16,12 @@ import { ...@@ -16,11 +16,12 @@ import {
const cokoTheme = { const cokoTheme = {
/* Colors */ /* Colors */
colorBackground: 'white', colorBackground: 'white',
colorSecondaryBackground: '#f9fafb', // custom
colorPrimary: '#0B65CB', colorPrimary: '#0B65CB',
colorSecondary: '#9e9e9e', colorSecondary: '#9e9e9e',
colorFurniture: '#E8E8E8', colorFurniture: '#E8E8E8',
colorBorder: '#AAA', colorBorder: '#AAA',
colorBackgroundHue: '#f9fafb', colorBackgroundHue: '#f4f5f7',
colorSuccess: '#008800', colorSuccess: '#008800',
colorError: '#FF2D1A', colorError: '#FF2D1A',
colorText: '#111', colorText: '#111',
...@@ -64,7 +65,7 @@ const cokoTheme = { ...@@ -64,7 +65,7 @@ const cokoTheme = {
gridUnit: '8px', gridUnit: '8px',
/* Border */ /* Border */
borderRadius: '0', borderRadius: '8px',
borderWidth: '1px', // julien: not 0 borderWidth: '1px', // julien: not 0
borderStyle: 'solid', borderStyle: 'solid',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment