Commit 2ee72a45 authored by Alexandros Georgantas's avatar Alexandros Georgantas

fix(app): fixes for the beta release

parent c32cb16b
......@@ -99,8 +99,9 @@ const Container = styled.div`
align-items: flex-start;
justify-content: flex-start;
position: relative;
margin-right: calc(1.5 * ${th('gridUnit')});
display: flex;
flex-basis: 33%;
flex-basis: 32.6%;
height: 282px;
/* min-width:390px; */
margin-bottom: calc(3 * ${th('gridUnit')});
......
......@@ -6,10 +6,13 @@ import { Template } from '../../ui'
const GridContainer = styled.div`
align-items: center;
justify-content: space-between;
justify-content: flex-start;
flex-wrap: wrap;
display: flex;
flex-basis: 100%;
div:nth-child(3n + 3) {
margin-right: 0;
}
`
const TemplatesGrid = props => {
......
......@@ -21,7 +21,7 @@
"react-powerplug": "^1.0.0",
"react-router-dom": "^5.0.0",
"styled-components": "^4.2.0",
"wax-editor-react": "^0.2.17"
"wax-editor-react": "^0.2.19"
},
"devDependencies": {
"babel-cli": "^6.26.0",
......
......@@ -18,14 +18,20 @@ const BookTitle = styled.div`
const WithLinkDecoration = styled.div`
a {
text-decoration: none;
color: black;
:hover {
border-bottom: 1px solid black;
}
}
`
const Header = styled.div`
display: flex;
align-items:center;
justify-content: space-around;
> div {
width: 33%;
text-align:center;
width: 30%;
}
`
......@@ -57,7 +63,10 @@ const WaxHeader = ({ bookComponent }) => {
<div>
{prevBookComponent && (
<WithLinkDecoration data-testid="previous-component">
{withLink(prevBookComponent.title, createUrl(prevBookComponent))}
{withLink(
`${prevBookComponent.title}`,
createUrl(prevBookComponent),
)}
</WithLinkDecoration>
)}
</div>
......@@ -65,7 +74,10 @@ const WaxHeader = ({ bookComponent }) => {
<div>
{nextBookComponent && (
<WithLinkDecoration data-testid="next-component">
{withLink(nextBookComponent.title, createUrl(nextBookComponent))}
{withLink(
`${nextBookComponent.title}`,
createUrl(nextBookComponent),
)}
</WithLinkDecoration>
)}
</div>
......
......@@ -6,7 +6,6 @@ import config from 'config'
import Wax from 'wax-editor-react'
import WaxHeader from './WaxHeader'
const Container = styled.div`
display: flex;
flex-direction: column;
......@@ -251,15 +250,17 @@ export class WaxPubsweet extends React.Component {
renderWax(editing) {
const { bookComponent, history, user, tags } = this.props
const waxConfig = {
layout: config.wax.layout,
lockWhenEditing: config.wax.lockWhenEditing,
theme: config.wax.theme,
autoSave: config.wax.autoSave,
menus:
menus: (
config.wax[bookComponent.divisionType.toLowerCase()][
bookComponent.componentType
] || ['component'].menus,
] || config.wax[bookComponent.divisionType.toLowerCase()].default
).menus,
}
const { layout, autoSave, menus } = waxConfig
......@@ -360,7 +361,6 @@ export class WaxPubsweet extends React.Component {
if (get(bookComponent, 'componentType') === 'chapter') {
chapterNumber = get(bookComponent, 'componentTypeOrder')
}
return (
<Container>
......
This diff is collapsed.
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