From a3cac2f2c82d7239e7cb9a7d8c782a5b9db4b652 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 27 Oct 2020 15:20:29 +0200
Subject: [PATCH] move right
---
editors/editoria/src/layout/EditoriaLayout.js | 8 +++++++-
.../src/FullScreenService/FullScreenTool.js | 15 +++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index 4668f5075..f79a54424 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -60,10 +60,16 @@ const TopMenu = styled.div`
${th('colorFurniture')};
}
- > div:last-child {
+
+ > div:nth-last-of-type(-n+2) {
margin-left: auto;
+ }
+
+ > div:last-child {
+ margin-left: 0;
margin-right: 10px;
}
+
> div[data-name="Tables"]{
border-right: none;
}
diff --git a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
index 1e110895e..ae8d74663 100644
--- a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
+++ b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
@@ -1,27 +1,34 @@
import React from 'react';
import { isEmpty } from 'lodash';
import { injectable } from 'inversify';
+import { FullScreen } from 'wax-prosemirror-components';
import Tools from '../lib/Tools';
export default
@injectable()
class FullScreenTool extends Tools {
title = 'full screen';
- icon = 'image';
+ icon = 'fullScreen';
name = 'FullScreen';
get run() {
return () => true;
}
- select = (state, activeViewId) => {};
+ select = (state, activeViewId) => {
+ return true;
+ };
get enable() {
- return state => {};
+ return state => {
+ return true;
+ };
}
renderTool(view) {
if (isEmpty(view)) return null;
- return this._isDisplayed ? <span key="1"> full</span> : null;
+ return this._isDisplayed ? (
+ <FullScreen key="FullScreen" item={this.toJSON()} view={view} />
+ ) : null;
}
}
--
GitLab