Commit 7a5f03d9 authored by Giannis Kopanas's avatar Giannis Kopanas
Browse files

Merge branch 'update-login-component' of...

Merge branch 'update-login-component' of https://gitlab.coko.foundation/editoria/ucp into update-login-component
parents 4ff3b858 de61529f
......@@ -47,7 +47,6 @@ import { hot } from 'react-hot-loader'
import createHistory from 'history/createBrowserHistory'
import { configureStore, Root } from 'pubsweet-client'
// import theme from '@pubsweet/coko-theme'
import theme from './theme'
import routes from './routes'
......
/* eslint-disable import/extensions */
import 'typeface-fira-sans'
// import 'typeface-fira-sans'
import theme from '@pubsweet/coko-theme'
import { clone } from 'lodash'
import { FormContainer, TextField, Heading, Button, Logo } from './elements'
export default {
/* Text variables */
// fonts
fontInterface: "'Fira Sans'",
colorBackground: 'white',
colorPrimary: '#0B65CB',
colorSecondary: '#E7E7E7',
colorFurniture: '#CCC',
colorBorder: '#AAA',
colorBackgroundHue: '#F1F1F1',
colorSuccess: '#008800',
colorError: '#FF2D1A',
colorText: '#111',
colorTextReverse: '#FFF',
colorTextPlaceholder: '#595959',
colorWarning: '#ffc107',
// TODO -- not used anywhere
// $colorInteract: var($colorPrimaryDarker);
// $colorPrimaryDarker: #0551a8
/* Text variables */
// fonts
fontHeading: "'Fira Sans Condensed'",
fontReading: "'Vollkorn'",
fontWriting: "'Cokourier Prime Sans'",
// font sizes
fontSizeBase: '16px',
fontSizeBaseSmall: '14px',
fontSizeHeading1: '40px',
fontSizeHeading2: '36px',
fontSizeHeading3: '28px',
fontSizeHeading4: '24px',
fontSizeHeading5: '20px',
fontSizeHeading6: '16px',
// line heights
lineHeightBase: '24px',
lineHeightBaseSmall: '16px',
lineHeightHeading1: '48px',
lineHeightHeading2: '40px',
lineHeightHeading3: '32px',
lineHeightHeading4: '32px',
lineHeightHeading5: '24px',
lineHeightHeading6: '24px',
/* Spacing */
gridUnit: '8px',
/* Border */
borderRadius: '0',
borderWidth: '1px', // julien: not 0
borderStyle: 'solid',
// Does not exist
// $borderColor: var($colorFurniture);
/* Shadow (for tooltip) */
boxShadow: '0 2px 4px 0 rgba(51, 51, 51, 0.3)',
/* Transition */
transitionDuration: '0.2s', // TODO -- julien: not 0.05s
transitionTimingFunction: 'ease',
transitionDelay: '0',
cssOverrides: {
ui: {
TextField,
H1: Heading.H1,
Button,
},
Login: {
FormContainer,
Logo,
},
const editoriaTheme = clone(theme)
editoriaTheme.fontInterface = 'Fira Sans'
editoriaTheme.cssOverrides = {
ui: {
TextField,
H1: Heading.H1,
Button,
},
Login: {
FormContainer,
Logo,
},
}
export default editoriaTheme
......@@ -445,6 +445,17 @@
objection "^1.5.3"
uuid "^3.3.2"
 
"@pubsweet/coko-theme@^5.0.7":
version "5.0.7"
resolved "https://registry.yarnpkg.com/@pubsweet/coko-theme/-/coko-theme-5.0.7.tgz#b799ca745ccd634e957140f65b987b7193ef5e2f"
integrity sha512-SHIn8NTvoQ9H12jF0W2DY8vA3O4EnJyI+g8IueP1+UpXVTCp+YnsldIycuH7RYdaCsCHSKWCJh5PR5Zb6Nup7g==
dependencies:
"@pubsweet/ui-toolkit" "^2.0.7"
cokourier-prime-sans "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git"
styled-components "^4.1.1"
typeface-fira-sans-condensed "^0.0.54"
typeface-vollkorn "^0.0.54"
"@pubsweet/component-polling-client@^0.0.3":
version "0.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/component-polling-client/-/component-polling-client-0.0.3.tgz#c59f2066c476587376980932e542c152629b6a32"
......@@ -508,15 +519,19 @@
tmp-promise "^1.0.5"
umzug "^2.1.0"
 
"@pubsweet/default-theme@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/default-theme/-/default-theme-4.0.3.tgz#13a97d5a446d38ed9d2cfee09f34e2a6e12d687f"
integrity sha512-11OQKa4JLExiv60ImVzXWV6HP0Dim+lNoZ3ncQ7ahwPbljjXskkZY1g9pOsCEds0jL66tBY/tLcKOgmgZd/Gnw==
"@pubsweet/errors@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.2.tgz#ef9789a03eed40504889ab8da06985fabea84290"
integrity sha512-D8emW9RsKzPU407IWPD4ZURSvGunesJwB0GeaSx3580ipPps8ieIYPEJAg4bg8GYJ0GHKr9ZK3quP78++zrpPA==
dependencies:
styled-components "^4.1.1"
typeface-noto-sans "^0.0.54"
typeface-noto-serif "^0.0.54"
typeface-ubuntu-mono "^0.0.54"
http-status-codes "^1.3.0"
"@pubsweet/errors@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.3.tgz#d64a012acc9e7f2813ab8684579d197832c0cc8d"
integrity sha512-6ZqspA9TvQKPkgdB7EFNdPZ4krS+1D2o2bBxlkEpyT2oqLQqh9Tl6ciLf9iXx+F9PVQ1Sv/0fr4Jg1rlyJlGYQ==
dependencies:
http-status-codes "^1.3.0"
 
"@pubsweet/errors@^2.0.2":
version "2.0.2"
......@@ -638,10 +653,10 @@
objection "^1.5.3"
pubsweet-server "^13.0.0"
 
"@pubsweet/ui-toolkit@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.0.3.tgz#673be0f68bfe3fb8c0a43401a3a032a6cfde75f7"
integrity sha512-zINDKK+A6kXllcYr8+hBdBij8pxF3uOWFGmQjctLBVHzgE6DTV0mPj2iv2WKezO1nE1EbJD5EyXqF4/72gQqQg==
"@pubsweet/ui-toolkit@^2.0.7":
version "2.0.7"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.0.7.tgz#27cdf66ce44d2d52097a227cfa621fa5482b7bf7"
integrity sha512-IChSeh1LAG6L8n9+kJP5gHIu5PEvCyn3UGxEPklInwJ/40kAOLtl8ktWrKmV0TNfQxG07IQ0VHVeZcsIAdSVSg==
dependencies:
color "^3.0.0"
lodash "^4.17.4"
......@@ -679,16 +694,17 @@
redux-form "^7.0.3"
styled-components "^3.2.5"
 
"@pubsweet/ui@^9.0.3":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-9.0.3.tgz#aac4746d6febecd88935e9b2ab1c9d0581baab29"
integrity sha512-8mfvxzNwTZIM0lgzHniJEn/fiyW7W5LyJh2pAYpc+Su8AuCDAKOCpQjeJlgtYzpJuZMoYJrRxfTbuLIz3c7q1g==
"@pubsweet/ui@^9.1.3":
version "9.1.3"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-9.1.3.tgz#1572aa5f1caed2adbe38de440b1c216b0864a47a"
integrity sha512-ju62aCirevdt26UvheKnx78SXfPCgG+ndZ/Oi1UVcNduP+SRbi+k4wpSpaZt+9qn22sxqnlhlYb7UIqoT/7weA==
dependencies:
"@pubsweet/ui-toolkit" "^2.0.3"
"@pubsweet/ui-toolkit" "^2.0.7"
babel-jest "^21.2.0"
classnames "^2.2.5"
enzyme "^3.7.0"
enzyme-adapter-react-16 "^1.1.1"
formik "^1.4.2"
invariant "^2.2.3"
lodash "^4.17.4"
moment "^2.22.1"
......@@ -3720,6 +3736,12 @@ codemirror@^5.18.2, codemirror@^5.38.0, codemirror@^5.40.2:
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.42.0.tgz#2d5b640ed009e89dee9ed8a2a778e2a25b65f9eb"
integrity sha512-pbApC8zDzItP3HRphD6kQVwS976qB5Qi0hU3MZMixLk+AyugOW1RF+8XJEjeyl5yWsHNe88tDUxzeRh5AOxPRw==
 
"cokourier-prime-sans@git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git":
version "0.0.1"
resolved "git+https://gitlab.coko.foundation/julientaq/cokourier-sans-prime.git#55aa30adce0193baac1ea026cf4409be9dd93a10"
dependencies:
typeface-open-sans "0.0.35"
collapse-white-space@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz#ce05cf49e54c3277ae573036a26851ba430a0091"
......@@ -15257,25 +15279,25 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
typeface-fira-sans-condensed@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-fira-sans-condensed/-/typeface-fira-sans-condensed-0.0.54.tgz#5fe692b4d1ec4083f198e22b8bb1e8b1ed541db0"
integrity sha512-Y/+UOdN75s1hpOoJhSavN1eTfmXLrUPHDeo2syCpnq18PAKQpglvRRM+3pDWtCjsFbni8N/1brgEV94Z9FNI9g==
typeface-fira-sans@^0.0.43:
version "0.0.43"
resolved "https://registry.yarnpkg.com/typeface-fira-sans/-/typeface-fira-sans-0.0.43.tgz#f9c026ae5b7ad5f1fb727f9947bd1e10e13702e6"
integrity sha512-gYk6C3FyXn2gFKxkqfgNLurgQmRGtMWR06XXYklRmnzJPcx3KGHHKL1sWTQfQxw0S2Lgt2+TqA0erKNs0ZQ37g==
 
typeface-noto-sans@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-noto-sans/-/typeface-noto-sans-0.0.54.tgz#16989ef56a5220b0503495ab8c1036f66b517b55"
integrity sha512-wV2BNwFuSOYaz96gk5fDuD0RB4pPKKgQvvM9ep6jWRUTqPuND+fM4wz0xAqxopTYeZ/sVunyFIc3iCq7gMbULQ==
typeface-noto-serif@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-noto-serif/-/typeface-noto-serif-0.0.54.tgz#26a552df3557c54f2f0c7f9bdbd28a95c9aab06b"
integrity sha512-GqplhQuONaGlWpeW4DZoMv64EKqwaLsTR9QCguV/zORZATEUxHvozvL4rudatCIu9lSnIgV5MrE/ZJhrscPHOg==
typeface-open-sans@0.0.35:
version "0.0.35"
resolved "https://registry.yarnpkg.com/typeface-open-sans/-/typeface-open-sans-0.0.35.tgz#170dc36bbbd63829c9ea64b991c2b0fd65017708"
integrity sha512-lNrL3aaatdSkSb8rH1R9GXS27xyD5H4h9NctEm9B5Uk/pKwCzDrUcZhbhYi5Yih5FcMa8ZTtdY5K1ziMxo6EEg==
 
typeface-ubuntu-mono@^0.0.54:
typeface-vollkorn@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-ubuntu-mono/-/typeface-ubuntu-mono-0.0.54.tgz#773582617ff60dc252acbaaeb22880ba7f559fe6"
integrity sha512-hwfEPLzA3f/q8RowZlW6Mmvqe8yffYk7vlwzia+n7xVjY16C2UvWWPCgGMXUbUIgFZIeqA5OvFwUjDMzi95wRw==
resolved "https://registry.yarnpkg.com/typeface-vollkorn/-/typeface-vollkorn-0.0.54.tgz#1288bcd7d81c3dd7cd419e4448580d2a0b0640b2"
integrity sha512-eVTGPinLEnT9IJdL/5HhNaily6de5zWB4w2VQyL2u67R4cdvh4i+cE7LVusef9YE5KW6wT4ZU9UQ8lS6qD7wuA==
 
typescript@^2.2.2:
version "2.9.2"
......
Markdown is supported
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