From 412a0716cc74bccedfb59b41bdd8177f3bf3f050 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 1 Oct 2020 15:26:37 +0300
Subject: [PATCH] additions/comments colors
---
.../trackChanges/TrackChangeEnable.js | 47 ++-----------------
.../src/layouts/EditorElements.js | 12 +++--
.../src/coko-theme/index.js | 2 +-
3 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangeEnable.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangeEnable.js
index aea281b0c..4615cdf3a 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangeEnable.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangeEnable.js
@@ -1,51 +1,12 @@
/* eslint react/prop-types: 0 */
-import React, { useContext, useState } from 'react';
-// import styled from 'styled-components';
-// import { ButtonStyles } from 'wax-prosemirror-themes';
-import { WaxContext } from 'wax-prosemirror-core';
+import React, { useState } from 'react';
import MenuButton from '../../ui/buttons/MenuButton';
-// const ButtonStyled = styled.button`
-// ${ButtonStyles};
-// opacity: ${props => (props.select ? 1 : 0.4)};
-// pointer-events: ${props => (props.select ? 'default' : 'none')};
-// color: ${props => (props.isActive ? 'white' : props.theme.colorButton)};
-// background-color: ${props =>
-// props.isActive ? props.theme.colorPrimary : 'transparent'};
-// &:hover {
-// background-color: ${props =>
-// props.isActive ? props.theme.colorPrimary : 'transparent'};
-// }
-// `;
-
const TrackChangeEnable = ({ view = {}, item, enabled }) => {
- if (item.onlyOnMain) {
- const {
- view: { main },
- } = useContext(WaxContext);
- view = main;
- }
-
const [isEnabled, setEnabled] = useState(enabled);
- // return (
- // <ButtonStyled
- // type="button"
- // isActive={isEnabled}
- // title={item.title}
- // disabled={item.enable && !item.enable(view.state)}
- // onMouseDown={e => {
- // e.preventDefault();
- // setEnabled(!isEnabled);
- // item.run(view.state, view.dispatch);
- // }}
- // select={item.select && item.select(view.state)}
- // >
- // {item.content}
- // </ButtonStyled>
- // );
-
- const handleMouseDown = () => {
+ const handleMouseDown = e => {
+ e.preventDefault();
setEnabled(!isEnabled);
item.run(view.state, view.dispatch);
};
@@ -55,7 +16,7 @@ const TrackChangeEnable = ({ view = {}, item, enabled }) => {
active={isEnabled}
disabled={item.enable && !item.enable(view.state)}
label="Track Changes"
- onMouseDown={handleMouseDown}
+ onMouseDown={e => handleMouseDown(e)}
title={item.title}
/>
);
diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js
index cfb7ef876..36432d02f 100644
--- a/wax-prosemirror-layouts/src/layouts/EditorElements.js
+++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js
@@ -21,6 +21,7 @@ export default css`
h2::selection,
h3::selection,
code::selection,
+ span::selection,
p span::selection,
h1 span::selection,
h2 span::selection,
@@ -205,9 +206,9 @@ export default css`
}
span.insertion {
- color: blue;
+ color: royalblue;
footnote: {
- background: blue;
+ background: royalblue;
}
}
@@ -219,7 +220,7 @@ export default css`
}
.format-change {
- border-bottom: 2px solid blue;
+ border-bottom: 2px solid royalblue;
}
[data-track] {
@@ -240,11 +241,12 @@ export default css`
}
span.comment {
- border-bottom: 2px solid #ffab20;
+ border-bottom: 2px solid gold;
border-radius: 3px 3px 0 0;
.active-comment {
- background-color: #ffab20;
+ background-color: gold;
+ color: black;
}
}
`;
diff --git a/wax-prosemirror-themes/src/coko-theme/index.js b/wax-prosemirror-themes/src/coko-theme/index.js
index baa707d26..977494a66 100644
--- a/wax-prosemirror-themes/src/coko-theme/index.js
+++ b/wax-prosemirror-themes/src/coko-theme/index.js
@@ -25,7 +25,7 @@ const cokoTheme = {
// fonts
fontInterface: 'Fira-Sans-Condensed',
- fontHeading: 'Amethysta',
+ fontHeading: 'Fira-Sans-Condensed',
fontReading: 'Vollkorn',
fontWriting: 'Merriweather',
--
GitLab