diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js index 9aee856a0018f196896ff03d37c48417e977270d..3d06af2633608efd024b5c63801b421c18877e9c 100644 --- a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js +++ b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js @@ -1,7 +1,7 @@ -import React from "react"; -import styled from "styled-components"; +import React from 'react'; +import styled from 'styled-components'; -import NoteNumber from "./NoteNumber"; +import NoteNumber from './NoteNumber'; const NoteEditorContainerStyled = styled.div` display: flex; @@ -23,6 +23,11 @@ const NoteStyled = styled.div` &:focus { outline: none; } + + p { + margin: 0; + } + span.comment { border-bottom: 2px solid #ffab20; border-radius: 3px 3px 0 0; diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js index bff58dbea4d1a510afe180e2b942e5c2764b0a78..32cce8b5db0e6772ebd91f56ef73b1e1859bf930 100644 --- a/wax-prosemirror-layouts/src/layouts/EditorElements.js +++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js @@ -170,6 +170,9 @@ export default css` span.deletion { text-decoration: line-through; color: red; + footnote { + background: red; + } } span.insertion { diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js index 4b98de07b2325ad0e6678876f35b4075255fb475..f1a97afd24d119771461e380e62d25c238eef635 100644 --- a/wax-prosemirror-schema/src/nodes/footNoteNode.js +++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js @@ -1,7 +1,7 @@ // TODO Write the node in WaxSchema const footnote = { group: 'inline', - content: 'inline*', + content: 'block*', inline: true, atom: true, attrs: { diff --git a/wax-prosemirror-schema/src/nodes/imageNode.js b/wax-prosemirror-schema/src/nodes/imageNode.js index 9ac1badd366fb0a74a50e0801b6015b0b635565c..9f5d51daae462dcbe1beb74fc35ef4bfe433411b 100644 --- a/wax-prosemirror-schema/src/nodes/imageNode.js +++ b/wax-prosemirror-schema/src/nodes/imageNode.js @@ -4,34 +4,34 @@ const image = { src: {}, alt: { default: null }, title: { default: null }, - track: { default: [] } + track: { default: [] }, }, - group: "inline", + group: 'inline', draggable: true, parseDOM: [ { - tag: "img[src]", + tag: 'img[src]', getAttrs(hook, next) { Object.assign(hook, { - src: hook.dom.getAttribute("src"), - title: hook.dom.getAttribute("title"), + src: hook.dom.getAttribute('src'), + title: hook.dom.getAttribute('title'), // track: parseTracks(hook.dom.dataset.track), - alt: hook.dom.getAttribute("alt") + alt: hook.dom.getAttribute('alt'), }); next(); - } - } + }, + }, ], toDOM(hook, next) { const attrs = {}; - let temp = ""; + let temp = ''; // if (hook.node.attrs.track.length) { // // attrs["data-track"] = JSON.stringify(hook.node.attrs.track); // } - let { src, alt, title } = hook.node.attrs; - hook.value = ["img", { src, alt, title }]; + const { src, alt, title } = hook.node.attrs; + hook.value = ['img', { src, alt, title }]; next(); - } + }, }; export default image;