From 5bea640a837bc6a4deba1d97fd4b2ab6e16c2f8e Mon Sep 17 00:00:00 2001 From: Matias Arriola Date: Wed, 26 Jan 2022 22:34:00 +0000 Subject: [PATCH] Integrate webapp to mindmap editor with toolbar actions --- wise-webapp/src/main/webapp/css/editor.css | 6 ++ .../src/main/webapp/jsp/mindmapEditor.jsp | 68 +++++++------------ 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/editor.css b/wise-webapp/src/main/webapp/css/editor.css index 084d7d95..e4596103 100644 --- a/wise-webapp/src/main/webapp/css/editor.css +++ b/wise-webapp/src/main/webapp/css/editor.css @@ -6,6 +6,11 @@ @import "header.css"; @import "../bootstrap/css/bootstrap.min.css"; +html { + /* avoid bootstrap overriding font-size and breaking Mui */ + font-size: initial; +} + body { -webkit-touch-callout: none; -webkit-user-select: none; @@ -126,6 +131,7 @@ div.shareModalDialog { } .popover { + font-size: 13px; max-width: none; } diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 50e8328d..12e3497f 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -8,15 +8,30 @@ <%--@elvariable id="editorTryMode" type="java.lang.String"--%> <%--@elvariable id="lockInfo" type="com.wisemapping.service.LockInfo"--%> - - + + - - <spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/> + + + + + <%@ include file="/jsp/pageHeaders.jsf" %> + Loading | WiseMapping + + - + +
+ + + +