Commit 7d3c8d8b authored by Christos's avatar Christos

Merge branch 'fixes' into 'master'

Fixes

See merge request !37
parents 25ebf79c 34e46ae2
......@@ -5,7 +5,7 @@
"dependencies": {
"@guardian/prosemirror-invisibles": "^1.2.0",
"prosemirror-schema-list": "^1.0.0",
"prosemirror-tables": "^0.7.10",
"prosemirror-tables": "^0.9.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "^4.2.0",
......@@ -24,16 +24,11 @@
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"browserslist": [">0.2%", "not dead", "not ie <= 11", "not op_mini all"],
"devDependencies": {
"babel-eslint": "10.0.3",
"babel-loader": "8.0.6",
"react-app-rewired": "^2.1.1",
"react-scripts": "3.2.0"
}
}
\ No newline at end of file
}
......@@ -36,7 +36,8 @@
"svg-inline-loader": "^0.8.0"
},
"resolutions": {
"styled-components": "4.2.0"
"styled-components": "4.2.0",
"prosemirror-model": "1.8.0"
},
"workspaces": [
"wax-prosemirror-core",
......
export { default as MainMenuBar } from "./src/mainMenuBar/MainMenuBar";
export { default as SideMenuBar } from "./src/sideMenuBar/SideMenuBar";
export { default as InfoArea } from "./src/components/infoArea/InfoArea";
......@@ -13,8 +13,8 @@
"@fortawesome/fontawesome-free-solid": "^5.0.4",
"@fortawesome/react-fontawesome": "^0.0.17",
"lodash": "^4.17.4",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-dropdown": "^1.6.2",
"styled-components": "^4.2.0",
"uuid": "^3.3.2"
......
import React from "react";
import styled from "styled-components";
const InfoAreaContainer = styled.div`
height: ${props => (props.height ? props.height : "30px")};
position: fixed;
bottom: 0;
z-index: 9999;
background: #efefef;
width: 100%;
`;
const InfoArea = () => <InfoAreaContainer />;
export default InfoArea;
......@@ -10,19 +10,19 @@
},
"dependencies": {
"lodash": "^4.17.4",
"prosemirror-commands": "^1.0.7",
"prosemirror-commands": "^1.1.0",
"prosemirror-dev-tools": "^2.1.1",
"prosemirror-dropcursor": "^1.1.1",
"prosemirror-gapcursor": "^1.0.3",
"prosemirror-history": "^1.0.4",
"prosemirror-inputrules": "^1.0.1",
"prosemirror-keymap": "^1.0.1",
"prosemirror-model": "^1.7.0",
"prosemirror-dropcursor": "^1.3.0",
"prosemirror-gapcursor": "^1.1.0",
"prosemirror-history": "^1.1.0",
"prosemirror-inputrules": "^1.1.0",
"prosemirror-keymap": "^1.1.0",
"prosemirror-model": "^1.8.0",
"prosemirror-state": "^1.2.2",
"prosemirror-transform": "^1.1.3",
"prosemirror-view": "^1.8.9",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"prosemirror-transform": "^1.2.0",
"prosemirror-view": "^1.13.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "^4.2.0"
},
"devDependencies": {
......
import styled, { ThemeProvider } from "styled-components";
import React, { Fragment } from "react";
import { MainMenuBar, SideMenuBar } from "wax-prosemirror-components";
import { MainMenuBar, SideMenuBar, InfoArea } from "wax-prosemirror-components";
import EditorElements from "./EditorElements";
import { cokoTheme } from "wax-prosemirror-themes";
......@@ -35,7 +35,6 @@ const WaxSurfaceScroll = styled.div`
const CommentsContainer = styled.div``;
const NotesContainer = styled.div``;
const InfoAreaContainer = styled.div``;
const EditoriaLayout = ({ editor, view, ...props }) => (
<ThemeProvider theme={cokoTheme}>
......@@ -47,6 +46,7 @@ const EditoriaLayout = ({ editor, view, ...props }) => (
{editor}
</WaxSurfaceScroll>
</WaxSurfaceContainer>
<InfoArea />
</LayoutWrapper>
</ThemeProvider>
);
......
......@@ -10,6 +10,6 @@
},
"dependencies": {
"prosemirror-state": "^1.2.2",
"prosemirror-view": "^1.8.9"
"prosemirror-view": "^1.13.1"
}
}
......@@ -10,6 +10,6 @@
},
"dependencies": {
"prosemirror-schema-list": "^1.0.0",
"prosemirror-tables": "^0.7.10"
"prosemirror-tables": "^0.9.5"
}
}
......@@ -2,7 +2,7 @@
import "typeface-fira-sans-condensed";
import "typeface-vollkorn";
import { ButtonStyled } from "./elements";
import { ButtonStyles } from "./elements";
const cokoTheme = {
/* Colors */
......@@ -69,7 +69,7 @@ const cokoTheme = {
cssOverrides: {
ui: {
ButtonStyled
ButtonStyles
}
}
};
......
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