Skip to content
Snippets Groups Projects
Commit 9410921e authored by Christos's avatar Christos
Browse files

Merge branch 'move-toolGroups' into 'master'

Move tool groups

See merge request !518
parents 1e255aed 38a4d4b6
No related branches found
No related tags found
1 merge request!518Move tool groups
Pipeline #56039 passed with stages
in 19 minutes and 38 seconds
...@@ -12,6 +12,10 @@ const MatchingWrapper = styled.div` ...@@ -12,6 +12,10 @@ const MatchingWrapper = styled.div`
flex-direction: column; flex-direction: column;
margin: 0px 38px 15px 38px; margin: 0px 38px 15px 38px;
margin-top: 10px; margin-top: 10px;
.ProseMirror-selectednode {
outline: none;
}
`; `;
const MatchingContainerTool = styled.div` const MatchingContainerTool = styled.div`
......
...@@ -16,6 +16,7 @@ import FakeCursorPlugin from '../plugins/FakeCursorPlugin'; ...@@ -16,6 +16,7 @@ import FakeCursorPlugin from '../plugins/FakeCursorPlugin';
const EditorWrapper = styled.div` const EditorWrapper = styled.div`
position: relative; position: relative;
height: 100%;
> .ProseMirror { > .ProseMirror {
padding: 5px !important; padding: 5px !important;
......
...@@ -119,6 +119,7 @@ export default ({ setPosition, position }) => { ...@@ -119,6 +119,7 @@ export default ({ setPosition, position }) => {
const { from } = selection; const { from } = selection;
const WaxSurface = activeView.dom.getBoundingClientRect(); const WaxSurface = activeView.dom.getBoundingClientRect();
const start = activeView.coordsAtPos(from); const start = activeView.coordsAtPos(from);
console.log(start, WaxSurface.top);
const left = start.left - WaxSurface.left - 75; const left = start.left - WaxSurface.left - 75;
const top = start.top - WaxSurface.top + 25; const top = start.top - WaxSurface.top + 25;
setPosition({ ...position, left, top }); setPosition({ ...position, left, top });
......
...@@ -14,16 +14,14 @@ const activeStylesSvg = css` ...@@ -14,16 +14,14 @@ const activeStylesSvg = css`
`; `;
const StyledIconActionContainer = styled.span` const StyledIconActionContainer = styled.span`
display: inline; display: inline-block;
padding: 2px;
${props => props.isActive && activeStylesContainer}
`;
const StyledIconAction = styled(Icon)`
height: 24px; height: 24px;
width: 24px; width: 24px;
cursor: pointer; cursor: pointer;
${props => props.isActive && activeStylesContainer}
`;
const StyledIconAction = styled(Icon)`
${props => props.isActive && activeStylesSvg} ${props => props.isActive && activeStylesSvg}
`; `;
......
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