aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/util/RichTextSchema.tsx10
-rw-r--r--src/client/util/TooltipTextMenu.tsx9
-rw-r--r--src/server/public/files/upload_1b4818f39ea324b5a687bb1ade3dca6c.jpgbin0 -> 26946 bytes
-rw-r--r--src/server/public/files/upload_1f1c6cfef33e5992fa860802e8c466a7.jpgbin0 -> 45309 bytes
-rw-r--r--src/server/public/files/upload_2045f363aa9cf281407703ca242aad1a.jpgbin0 -> 9009 bytes
-rw-r--r--src/server/public/files/upload_25bffd90c080c27f5ac822984406b958.jpgbin0 -> 43534 bytes
-rw-r--r--src/server/public/files/upload_261f11dc39ad568212b5c7e39d1e6d13.jpgbin0 -> 27259 bytes
-rw-r--r--src/server/public/files/upload_26bcc62639141ba64e603daebb5bf5d3.pngbin0 -> 2757327 bytes
-rw-r--r--src/server/public/files/upload_2d77d0773612e4723b78118ac50a2929.jpgbin0 -> 1805512 bytes
-rw-r--r--src/server/public/files/upload_2de9ad4dc687c53760c39f724c9a08a5.jpgbin0 -> 77462 bytes
-rw-r--r--src/server/public/files/upload_4abb568aa7cce9d291532c3d0da97102.jpgbin0 -> 22445 bytes
-rw-r--r--src/server/public/files/upload_54c34aaca5a7bf510cebad461ec39512.pngbin0 -> 2757327 bytes
-rw-r--r--src/server/public/files/upload_562b1e527300df8b350eeab094b3e1f1.jpgbin0 -> 15988 bytes
-rw-r--r--src/server/public/files/upload_6a26d3f7008a8c79ee5fc8054ba69996.jpgbin0 -> 45025 bytes
-rw-r--r--src/server/public/files/upload_70fa5e0c3f393504349d5865e28f4cac.jpgbin0 -> 18041 bytes
-rw-r--r--src/server/public/files/upload_8155b5b0f57da107bb07083c04e78943.jpgbin0 -> 31103 bytes
-rw-r--r--src/server/public/files/upload_88f588574e0efc415186af935114af9a.jpgbin0 -> 40249 bytes
-rw-r--r--src/server/public/files/upload_8d1c253f93f77c69c0c04ae3efb7d714.pngbin0 -> 2757327 bytes
-rw-r--r--src/server/public/files/upload_9ef80158609f5ff739087aecad367b9d.jpgbin0 -> 28523 bytes
-rw-r--r--src/server/public/files/upload_c39a7e0d7e8d35bb18461a5a0aa063bf.jpgbin0 -> 13811 bytes
-rw-r--r--src/server/public/files/upload_c6b81ab4eb70465a7e9b45d5c8f3ecaa.jpgbin0 -> 28566 bytes
-rw-r--r--src/server/public/files/upload_c99ec7a8a2df0b2f90479fde7d70c2eb.jpgbin0 -> 21995 bytes
-rw-r--r--src/server/public/files/upload_cec1cfcc67cfe5889de4098a49fec45e.jpgbin0 -> 22125 bytes
-rw-r--r--src/server/public/files/upload_f27688fe92dc7de398e957e5d96e1a22.jpgbin0 -> 18964 bytes
24 files changed, 14 insertions, 5 deletions
diff --git a/src/client/util/RichTextSchema.tsx b/src/client/util/RichTextSchema.tsx
index 2a3c1da6e..98c22204a 100644
--- a/src/client/util/RichTextSchema.tsx
+++ b/src/client/util/RichTextSchema.tsx
@@ -222,7 +222,15 @@ export const marks: { [index: string]: MarkSpec } = {
code: {
parseDOM: [{ tag: "code" }],
toDOM() { return codeDOM }
- }
+ },
+
+
+ timesNewRoman: {
+ parseDOM: [{ style: 'font-family: "Times New Roman", Times, serif;' }],
+ toDOM: () => ['span', {
+ style: 'font-family: "Times New Roman", Times, serif;'
+ }]
+ },
}
// :: Schema
diff --git a/src/client/util/TooltipTextMenu.tsx b/src/client/util/TooltipTextMenu.tsx
index eaf18825c..3f37d5fb8 100644
--- a/src/client/util/TooltipTextMenu.tsx
+++ b/src/client/util/TooltipTextMenu.tsx
@@ -1,4 +1,5 @@
import { action, IReactionDisposer, reaction } from "mobx";
+import { Dropdown, DropdownSubmenu, MenuItem } from "prosemirror-menu";
import { baseKeymap, lift } from "prosemirror-commands";
import { history, redo, undo } from "prosemirror-history";
import { keymap } from "prosemirror-keymap";
@@ -6,7 +7,6 @@ import { EditorState, Transaction, NodeSelection } from "prosemirror-state";
import { EditorView } from "prosemirror-view";
import { schema } from "./RichTextSchema";
import { Schema, NodeType } from "prosemirror-model";
-import { liftItem } from "prosemirror-menu";
import React = require("react");
import "./TooltipTextMenu.scss";
const { toggleMark, setBlockType, wrapIn } = require("prosemirror-commands");
@@ -44,15 +44,16 @@ export class TooltipTextMenu {
{ command: toggleMark(schema.marks.superscript), dom: this.icon("s", "superscript") },
{ command: toggleMark(schema.marks.subscript), dom: this.icon("s", "subscript") },
{ command: wrapInList(schema.nodes.bullet_list), dom: this.icon(":", "bullets") },
- //{ command: lift, dom: this.icon("<", "unindent") },
-
- { command: lift, dom: this.unorderedListIcon() },
+ { command: toggleMark(schema.marks.timesNewRoman), dom: this.icon("x", "TNR") },
+ { command: lift, dom: this.icon("<", "lift") },
]
//add menu items
items.forEach(({ dom, command }) => {
this.tooltip.appendChild(dom);
});
+ //add dropdowns
+
//pointer down handler to activate button effects
this.tooltip.addEventListener("pointerdown", e => {
e.preventDefault();
diff --git a/src/server/public/files/upload_1b4818f39ea324b5a687bb1ade3dca6c.jpg b/src/server/public/files/upload_1b4818f39ea324b5a687bb1ade3dca6c.jpg
new file mode 100644
index 000000000..aeb10c4b0
--- /dev/null
+++ b/src/server/public/files/upload_1b4818f39ea324b5a687bb1ade3dca6c.jpg
Binary files differ
diff --git a/src/server/public/files/upload_1f1c6cfef33e5992fa860802e8c466a7.jpg b/src/server/public/files/upload_1f1c6cfef33e5992fa860802e8c466a7.jpg
new file mode 100644
index 000000000..a2c1d8a46
--- /dev/null
+++ b/src/server/public/files/upload_1f1c6cfef33e5992fa860802e8c466a7.jpg
Binary files differ
diff --git a/src/server/public/files/upload_2045f363aa9cf281407703ca242aad1a.jpg b/src/server/public/files/upload_2045f363aa9cf281407703ca242aad1a.jpg
new file mode 100644
index 000000000..c19b31a38
--- /dev/null
+++ b/src/server/public/files/upload_2045f363aa9cf281407703ca242aad1a.jpg
Binary files differ
diff --git a/src/server/public/files/upload_25bffd90c080c27f5ac822984406b958.jpg b/src/server/public/files/upload_25bffd90c080c27f5ac822984406b958.jpg
new file mode 100644
index 000000000..3614b42eb
--- /dev/null
+++ b/src/server/public/files/upload_25bffd90c080c27f5ac822984406b958.jpg
Binary files differ
diff --git a/src/server/public/files/upload_261f11dc39ad568212b5c7e39d1e6d13.jpg b/src/server/public/files/upload_261f11dc39ad568212b5c7e39d1e6d13.jpg
new file mode 100644
index 000000000..ecd12d9cb
--- /dev/null
+++ b/src/server/public/files/upload_261f11dc39ad568212b5c7e39d1e6d13.jpg
Binary files differ
diff --git a/src/server/public/files/upload_26bcc62639141ba64e603daebb5bf5d3.png b/src/server/public/files/upload_26bcc62639141ba64e603daebb5bf5d3.png
new file mode 100644
index 000000000..e2297cb3c
--- /dev/null
+++ b/src/server/public/files/upload_26bcc62639141ba64e603daebb5bf5d3.png
Binary files differ
diff --git a/src/server/public/files/upload_2d77d0773612e4723b78118ac50a2929.jpg b/src/server/public/files/upload_2d77d0773612e4723b78118ac50a2929.jpg
new file mode 100644
index 000000000..261a0ceff
--- /dev/null
+++ b/src/server/public/files/upload_2d77d0773612e4723b78118ac50a2929.jpg
Binary files differ
diff --git a/src/server/public/files/upload_2de9ad4dc687c53760c39f724c9a08a5.jpg b/src/server/public/files/upload_2de9ad4dc687c53760c39f724c9a08a5.jpg
new file mode 100644
index 000000000..6b6ec3c3f
--- /dev/null
+++ b/src/server/public/files/upload_2de9ad4dc687c53760c39f724c9a08a5.jpg
Binary files differ
diff --git a/src/server/public/files/upload_4abb568aa7cce9d291532c3d0da97102.jpg b/src/server/public/files/upload_4abb568aa7cce9d291532c3d0da97102.jpg
new file mode 100644
index 000000000..f6332670c
--- /dev/null
+++ b/src/server/public/files/upload_4abb568aa7cce9d291532c3d0da97102.jpg
Binary files differ
diff --git a/src/server/public/files/upload_54c34aaca5a7bf510cebad461ec39512.png b/src/server/public/files/upload_54c34aaca5a7bf510cebad461ec39512.png
new file mode 100644
index 000000000..e2297cb3c
--- /dev/null
+++ b/src/server/public/files/upload_54c34aaca5a7bf510cebad461ec39512.png
Binary files differ
diff --git a/src/server/public/files/upload_562b1e527300df8b350eeab094b3e1f1.jpg b/src/server/public/files/upload_562b1e527300df8b350eeab094b3e1f1.jpg
new file mode 100644
index 000000000..db40705dd
--- /dev/null
+++ b/src/server/public/files/upload_562b1e527300df8b350eeab094b3e1f1.jpg
Binary files differ
diff --git a/src/server/public/files/upload_6a26d3f7008a8c79ee5fc8054ba69996.jpg b/src/server/public/files/upload_6a26d3f7008a8c79ee5fc8054ba69996.jpg
new file mode 100644
index 000000000..f0417a752
--- /dev/null
+++ b/src/server/public/files/upload_6a26d3f7008a8c79ee5fc8054ba69996.jpg
Binary files differ
diff --git a/src/server/public/files/upload_70fa5e0c3f393504349d5865e28f4cac.jpg b/src/server/public/files/upload_70fa5e0c3f393504349d5865e28f4cac.jpg
new file mode 100644
index 000000000..395f8ec21
--- /dev/null
+++ b/src/server/public/files/upload_70fa5e0c3f393504349d5865e28f4cac.jpg
Binary files differ
diff --git a/src/server/public/files/upload_8155b5b0f57da107bb07083c04e78943.jpg b/src/server/public/files/upload_8155b5b0f57da107bb07083c04e78943.jpg
new file mode 100644
index 000000000..53d9315a9
--- /dev/null
+++ b/src/server/public/files/upload_8155b5b0f57da107bb07083c04e78943.jpg
Binary files differ
diff --git a/src/server/public/files/upload_88f588574e0efc415186af935114af9a.jpg b/src/server/public/files/upload_88f588574e0efc415186af935114af9a.jpg
new file mode 100644
index 000000000..b72dbc482
--- /dev/null
+++ b/src/server/public/files/upload_88f588574e0efc415186af935114af9a.jpg
Binary files differ
diff --git a/src/server/public/files/upload_8d1c253f93f77c69c0c04ae3efb7d714.png b/src/server/public/files/upload_8d1c253f93f77c69c0c04ae3efb7d714.png
new file mode 100644
index 000000000..e2297cb3c
--- /dev/null
+++ b/src/server/public/files/upload_8d1c253f93f77c69c0c04ae3efb7d714.png
Binary files differ
diff --git a/src/server/public/files/upload_9ef80158609f5ff739087aecad367b9d.jpg b/src/server/public/files/upload_9ef80158609f5ff739087aecad367b9d.jpg
new file mode 100644
index 000000000..84423538c
--- /dev/null
+++ b/src/server/public/files/upload_9ef80158609f5ff739087aecad367b9d.jpg
Binary files differ
diff --git a/src/server/public/files/upload_c39a7e0d7e8d35bb18461a5a0aa063bf.jpg b/src/server/public/files/upload_c39a7e0d7e8d35bb18461a5a0aa063bf.jpg
new file mode 100644
index 000000000..dc7ec2f33
--- /dev/null
+++ b/src/server/public/files/upload_c39a7e0d7e8d35bb18461a5a0aa063bf.jpg
Binary files differ
diff --git a/src/server/public/files/upload_c6b81ab4eb70465a7e9b45d5c8f3ecaa.jpg b/src/server/public/files/upload_c6b81ab4eb70465a7e9b45d5c8f3ecaa.jpg
new file mode 100644
index 000000000..4422124a1
--- /dev/null
+++ b/src/server/public/files/upload_c6b81ab4eb70465a7e9b45d5c8f3ecaa.jpg
Binary files differ
diff --git a/src/server/public/files/upload_c99ec7a8a2df0b2f90479fde7d70c2eb.jpg b/src/server/public/files/upload_c99ec7a8a2df0b2f90479fde7d70c2eb.jpg
new file mode 100644
index 000000000..3747ca985
--- /dev/null
+++ b/src/server/public/files/upload_c99ec7a8a2df0b2f90479fde7d70c2eb.jpg
Binary files differ
diff --git a/src/server/public/files/upload_cec1cfcc67cfe5889de4098a49fec45e.jpg b/src/server/public/files/upload_cec1cfcc67cfe5889de4098a49fec45e.jpg
new file mode 100644
index 000000000..95053d772
--- /dev/null
+++ b/src/server/public/files/upload_cec1cfcc67cfe5889de4098a49fec45e.jpg
Binary files differ
diff --git a/src/server/public/files/upload_f27688fe92dc7de398e957e5d96e1a22.jpg b/src/server/public/files/upload_f27688fe92dc7de398e957e5d96e1a22.jpg
new file mode 100644
index 000000000..9841bad3f
--- /dev/null
+++ b/src/server/public/files/upload_f27688fe92dc7de398e957e5d96e1a22.jpg
Binary files differ