diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index cda67ab4242f47d279a5a480a2dfe0ae28d18967..fdfcf10021abe549c6b88588ec367d1b4557c581 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror UI components",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-components/src/ui/comments/CommentBox.js b/wax-prosemirror-components/src/ui/comments/CommentBox.js
index effa915f4c52c05df5338b235b82b5e86db31202..806c8c0c50238b88dedaed8fde45341bedf24a50 100644
--- a/wax-prosemirror-components/src/ui/comments/CommentBox.js
+++ b/wax-prosemirror-components/src/ui/comments/CommentBox.js
@@ -25,7 +25,7 @@ const Wrapper = styled.div`
box-sizing: border-box;
display: flex;
flex-direction: column;
- font-family: ${th('fontWriting')};
+ font-family: ${th('fontInterface')};
${props => !props.active && inactive}
`;
diff --git a/wax-prosemirror-components/src/ui/comments/CommentItem.js b/wax-prosemirror-components/src/ui/comments/CommentItem.js
index 5357002928a98989a8824463e618dc59a369cfd4..0baeb8c2ebf37d5373ba13d32722709a3b9fda02 100644
--- a/wax-prosemirror-components/src/ui/comments/CommentItem.js
+++ b/wax-prosemirror-components/src/ui/comments/CommentItem.js
@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
+import { grid, th } from '@pubsweet/ui-toolkit';
import DateParser from './DateParser';
const Wrapper = styled.div``;
@@ -9,20 +10,22 @@ const Wrapper = styled.div``;
const Head = styled.div`
display: flex;
flex-direction: column;
- margin-bottom: 8px;
+ font-size: 14px;
+ margin-bottom: ${grid(2)};
`;
const Name = styled.div`
- font-size: 12px;
+ font-size: ${th('fontSizeBaseSmall')};
`;
const Timestamp = styled.div`
- font-size: 10px;
+ font-size: 14px;
color: gray;
`;
const Content = styled.div`
- font-size: 14px;
+ font-family: ${th('fontReading')};
+ font-size: 16px;
`;
const CommentItem = props => {
diff --git a/wax-prosemirror-components/src/ui/comments/CommentReply.js b/wax-prosemirror-components/src/ui/comments/CommentReply.js
index 0f652fc9d93077d9cc693af23a449c8498dbe621..5c84ec33adb23a66c34152f409ab526fec56289f 100644
--- a/wax-prosemirror-components/src/ui/comments/CommentReply.js
+++ b/wax-prosemirror-components/src/ui/comments/CommentReply.js
@@ -2,11 +2,13 @@ import React, { useState, useRef, useEffect } from 'react';
import PropTypes from 'prop-types';
import styled, { css } from 'styled-components';
+import { grid, th } from '@pubsweet/ui-toolkit';
+
const Wrapper = styled.div`
background: #e2e2e2;
display: flex;
flex-direction: column;
- padding: 8px 16px;
+ padding: ${grid(2)} ${grid(4)};
`;
const TextWrapper = styled.div``;
@@ -14,6 +16,7 @@ const TextWrapper = styled.div``;
const ReplyTextArea = styled.textarea`
background: #e2e2e2;
box-sizing: border-box;
+ font-family: ${th('fontWriting')};
width: 100%;
`;
@@ -33,7 +36,7 @@ const Button = styled.button`
border-radius: 5px;
cursor: pointer;
color: gray;
- padding: 8px 16px;
+ padding: ${grid(2)} ${grid(4)};
${props => props.primary && primary}
${props => props.disabled && `cursor: not-allowed;`}
diff --git a/wax-prosemirror-components/src/ui/comments/DateParser.js b/wax-prosemirror-components/src/ui/comments/DateParser.js
index 7bd8716bd741ea16c2b1a37dbf46c4e9a9198b54..231d0af59d3cc9794a70655fce65c574203a28ae 100644
--- a/wax-prosemirror-components/src/ui/comments/DateParser.js
+++ b/wax-prosemirror-components/src/ui/comments/DateParser.js
@@ -7,36 +7,6 @@ const getDuration = timestamp => {
return moment.duration(today.diff(stamp));
};
-// const D = ({ children, timestamp, timeAgo }) => children(timestamp, timeAgo);
-
-// const DateParser = compose(
-// setDisplayName('DateParser'),
-// withHandlers({
-// renderTimestamp: ({
-// timestamp,
-// dateFormat = 'DD.MM.YYYY',
-// humanizeThreshold = 0,
-// }) => () => {
-// if (!timestamp) return '';
-// const duration = getDuration(timestamp);
-
-// if (duration.asDays() < humanizeThreshold) {
-// return `${duration.humanize()} ago`;
-// }
-// return moment(timestamp).format(dateFormat);
-// },
-// renderTimeAgo: ({ timestamp }) => () => {
-// if (!timestamp) return '';
-// const duration = getDuration(timestamp);
-// return duration.humanize();
-// },
-// }),
-// withProps(({ renderTimestamp, renderTimeAgo }) => ({
-// timeAgo: renderTimeAgo(),
-// timestamp: renderTimestamp(),
-// })),
-// )(D);
-
const DateParser = props => {
const { children, timestamp, dateFormat, humanizeThreshold } = props;
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 4fe79e6856bf28fe05c1862ba3acd6314b10c52e..a7561401a7b9a965710e1f67883363c7e8088fb4 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror core",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
@@ -27,25 +27,13 @@
"prosemirror-model": "1.11.0",
"prosemirror-state": "1.3.3",
"prosemirror-transform": "1.2.6",
- "prosemirror-view": "1.15.0",
+ "prosemirror-view": "1.15.2",
"reflect-metadata": "^0.1.13",
"styled-components": "^4.2.0",
"uuid": "^7.0.3",
"wax-prosemirror-services": "^0.0.19",
"wax-prosemirror-utilities": "^0.0.19"
},
- "resolutions": {
- "prosemirror-commands": "1.1.4",
- "prosemirror-dropcursor": "1.3.2",
- "prosemirror-gapcursor": "1.1.5",
- "prosemirror-history": "1.1.3",
- "prosemirror-inputrules": "1.1.2",
- "prosemirror-keymap": "1.1.4",
- "prosemirror-model": "1.11.0",
- "prosemirror-state": "1.3.3",
- "prosemirror-transform": "1.2.6",
- "prosemirror-view": "1.15.0"
- },
"devDependencies": {
"mocha": "^3.4.2",
"prosemirror-test-builder": "^1.0.1"
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index 62430b10f49616445c48c1b32b01d2fa8b066641..f18922989e64ad4705749890e5e2c7ceee31f97c 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror layouts",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js
index 36432d02f1cfd7a9153bc81921ed5f6ce38373d8..922a2f997102719ee69f804158ff89fadfe7dafb 100644
--- a/wax-prosemirror-layouts/src/layouts/EditorElements.js
+++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js
@@ -1,6 +1,6 @@
import { css } from 'styled-components';
-import { th } from '@pubsweet/ui-toolkit';
+import { lighten, th } from '@pubsweet/ui-toolkit';
/* All styles regarding ProseMirror surface and elements */
@@ -212,8 +212,14 @@ export default css`
}
}
- .selected-insertion,
- .selected-deletion,
+ .selected-insertion {
+ background: ${lighten('royalblue', 0.65)};
+ }
+
+ .selected-deletion {
+ background: ${lighten('indianred', 0.65)};
+ }
+
.selected-format-change,
.selected-block-change {
background-color: #eefbfb;
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index a6f86c22e44ab848d46625fd1f075469a95b90ee..f863ca6177736d37af4da2e8f9f47ee8af8ce59f 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror plugins",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
@@ -17,14 +17,10 @@
"lodash": "^4.17.4",
"prosemirror-highlightjs": "^0.2.0",
"prosemirror-state": "1.3.3",
- "prosemirror-view": "1.15.0",
+ "prosemirror-view": "1.15.2",
"wax-prosemirror-components": "^0.0.19",
"wax-prosemirror-core": "^0.0.19",
"wax-prosemirror-layouts": "^0.0.19",
"wax-prosemirror-utilities": "^0.0.19"
- },
- "resolutions": {
- "prosemirror-state": "1.3.3",
- "prosemirror-view": "1.15.0"
}
}
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 1bebb06e488daf95e5b5474a59684cd3e58925e4..4481099d1add7068b411c08017f0635913fd9b8b 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror schema",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
@@ -14,7 +14,7 @@
},
"dependencies": {
"prosemirror-schema-list": "^1.1.4",
- "prosemirror-tables": "^1.1.0",
+ "prosemirror-tables": "^1.1.1",
"wax-prosemirror-utilities": "^0.0.19"
}
}
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index beab4008e6751edaba7e36e78a8ca2df24711490..17473aeda655116e64bcd52991c33969ced54c51 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror services",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
@@ -23,7 +23,7 @@
"prosemirror-schema-list": "1.1.4",
"prosemirror-state": "1.3.3",
"prosemirror-transform": "1.2.6",
- "prosemirror-view": "1.15.0",
+ "prosemirror-view": "1.15.2",
"styled-components": "^4.2.0",
"uuid": "^7.0.3",
"wax-prosemirror-components": "^0.0.19",
@@ -33,16 +33,6 @@
"wax-prosemirror-schema": "^0.0.19",
"wax-prosemirror-utilities": "^0.0.19"
},
- "resolutions": {
- "prosemirror-commands": "1.1.4",
- "prosemirror-history": "1.1.3",
- "prosemirror-keymap": "1.1.4",
- "prosemirror-model": "1.11.0",
- "prosemirror-schema-list": "1.1.4",
- "prosemirror-state": "1.3.3",
- "prosemirror-transform": "1.2.6",
- "prosemirror-view": "1.15.0"
- },
"peerDependencies": {
"react": "^16.13.1",
"react-dom": "^16.13.1"
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index 866b17050afea013f925c379df7659c84c352e39..b8d9870db753f1f777e9a206693fe0fa63df59db 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror themes",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 33976a2e491bf1f29398d242e5d440ec734abac1..2e498343bcddc555d041d59be191402cad856891 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
"version": "0.0.19",
"description": "Wax prosemirror utilities",
"license": "MIT",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist"
],
@@ -16,8 +16,5 @@
"prosemirror-commands": "1.1.4",
"prosemirror-utils": "^0.9.6",
"uuid": "^7.0.3"
- },
- "resolutions": {
- "prosemirror-commands": "1.1.4"
}
}
diff --git a/yarn.lock b/yarn.lock
index 1aa7cd780c6a0c78223d866b6e00d2b40c30ecd3..23d5098aed69fa0a6a36616b68b1763de25fbda6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14307,6 +14307,17 @@ prosemirror-tables@^1.1.0:
prosemirror-transform "^1.2.1"
prosemirror-view "^1.13.3"
+prosemirror-tables@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e"
+ integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA==
+ dependencies:
+ prosemirror-keymap "^1.1.2"
+ prosemirror-model "^1.8.1"
+ prosemirror-state "^1.3.1"
+ prosemirror-transform "^1.2.1"
+ prosemirror-view "^1.13.3"
+
prosemirror-test-builder@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.0.3.tgz#9706b6e021efe82830b479797923d835f4ca12a3"
@@ -14328,10 +14339,19 @@ prosemirror-utils@^0.9.6:
resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973"
integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==
-prosemirror-view@1.15.0, prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.5.1:
- version "1.15.0"
- resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.0.tgz#372102c91d05b3b0f371b3eb59aeacedb5011bba"
- integrity sha512-a7Q76sO/DCZr2UX2Rv1Rbw52cr9kVIz8iJOf/rq4mPN1NA3lugq2BKJgUMwlB3U4utyw3olLigqouRHM48NJyg==
+prosemirror-view@1.15.2:
+ version "1.15.2"
+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.2.tgz#3f07881d11f18c033467591bbaec26b569bbc22c"
+ integrity sha512-0wftmMDVD8VXj2HZgv6Rg//+tgJC0lpV9LkYlCiAkDLKsf4yW3Ozs5td1ZXqsyoqvX0ga/k5g2EyLbqOMmC1+w==
+ dependencies:
+ prosemirror-model "^1.1.0"
+ prosemirror-state "^1.0.0"
+ prosemirror-transform "^1.1.0"
+
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.5.1:
+ version "1.16.0"
+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.16.0.tgz#024440a8e9acbbb5826572eef58c21c11cd1e454"
+ integrity sha512-iFtStCw2byF0yLc3mm1ezGdFSd6SWM4pnJod+ZaJiU5ju36QdYM4Xwa+qNm/AaI2/MgxpJqi8jsGWOJNkeBQ/Q==
dependencies:
prosemirror-model "^1.1.0"
prosemirror-state "^1.0.0"