From 4309c4f8e29f10c613550e8372b025fb76d642ac Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 16 Oct 2020 18:52:17 +0100
Subject: [PATCH] Desktop: Fixed Toggle Editor button toolip and icon

---
 ElectronClient/gui/NoteEditor/NoteEditor.tsx                | 2 +-
 .../gui/ToggleEditorsButton/ToggleEditorsButton.tsx         | 2 +-
 ElectronClient/gui/ToggleEditorsButton/styles/index.ts      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ElectronClient/gui/NoteEditor/NoteEditor.tsx b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
index 2737de3fa..bd4eb0bef 100644
--- a/ElectronClient/gui/NoteEditor/NoteEditor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
@@ -435,7 +435,7 @@ function NoteEditor(props: NoteEditorProps) {
 
 	const wysiwygBanner = props.bodyEditor !== 'TinyMCE' ? null : (
 		<div style={{ ...styles.warningBanner }}>
-			This is an experimental WYSIWYG editor for evaluation only. Please do not use with important notes as you may lose some data! See the <a style={styles.urlColor} onClick={introductionPostLinkClick} href="#">introduction post</a> for more information. TO SWITCH TO THE MARKDOWN EDITOR PLEASE PRESS "Code View".
+			This is an experimental Rich Text editor for evaluation only. Please do not use with important notes as you may lose some data! See the <a style={styles.urlColor} onClick={introductionPostLinkClick} href="#">introduction post</a> for more information. To switch to the Markdown Editor please press the "Toggle editors" in the top right-hand corner.
 		</div>
 	);
 
diff --git a/ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.tsx b/ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.tsx
index ff6e85377..031650597 100644
--- a/ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.tsx
+++ b/ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.tsx
@@ -17,7 +17,7 @@ export default function ToggleEditorsButton(props:Props) {
 	const style = styles_(props);
 
 	return (
-		<button style={style.button} disabled={!props.toolbarButtonInfo.enabled} aria-label={props.toolbarButtonInfo.title} title={props.toolbarButtonInfo.title} type="button" className="tox-tbtn" aria-pressed="false" onClick={props.toolbarButtonInfo.onClick}>
+		<button style={style.button} disabled={!props.toolbarButtonInfo.enabled} aria-label={props.toolbarButtonInfo.tooltip} title={props.toolbarButtonInfo.tooltip} type="button" className="tox-tbtn" aria-pressed="false" onClick={props.toolbarButtonInfo.onClick}>
 			<div style={style.leftInnerButton}>
 				<i style={style.leftIcon} className="fab fa-markdown"></i>
 			</div>
diff --git a/ElectronClient/gui/ToggleEditorsButton/styles/index.ts b/ElectronClient/gui/ToggleEditorsButton/styles/index.ts
index d8c12d0c0..ed73bc2f2 100644
--- a/ElectronClient/gui/ToggleEditorsButton/styles/index.ts
+++ b/ElectronClient/gui/ToggleEditorsButton/styles/index.ts
@@ -5,7 +5,7 @@ export default function styles(props:Props) {
 	return buildStyle(['ToggleEditorsButton', props.value], props.themeId, (theme: any) => {
 		const iconSize = 15;
 		const mdIconWidth = iconSize * 1.25;
-		const buttonHeight = theme.toolbarHeight - 8;
+		const buttonHeight = theme.toolbarHeight - 7;
 		const mdIconPadding = Math.round((buttonHeight - iconSize) / 2) + 3;
 
 		const innerButton:any = {
@@ -41,14 +41,14 @@ export default function styles(props:Props) {
 			leftIcon: {
 				fontSize: iconSize,
 				position: 'relative',
-				top: 1,
+				top: 2,
 				color: theme.color3,
 			},
 			rightIcon: {
 				fontSize: iconSize - 1,
 				borderLeft: 'none',
 				position: 'relative',
-				top: 1,
+				top: 2,
 				color: theme.color3,
 			},
 		};