Merge branch 'refs/heads/master' into v0.7.1

1 files changed, 26 insertions, 0 deletions

diff --git a/imports/codemirror/mode/tiki/tiki.css b/imports/codemirror/mode/tiki/tiki.css
new file mode 100644
index 00000000..e3c3c0fd
--- /dev/null
+++ b/imports/codemirror/mode/tiki/tiki.css
@@ -0,0 +1,26 @@
+.cm-tw-syntaxerror {
+        color: #FFFFFF;
+        background-color: #990000;
+}
+
+.cm-tw-deleted {
+        text-decoration: line-through;
+}
+
+.cm-tw-header5 {
+        font-weight: bold;
+}
+.cm-tw-listitem:first-child { /*Added first child to fix duplicate padding when highlighting*/
+        padding-left: 10px;
+}
+
+.cm-tw-box {
+        border-top-width: 0px ! important;
+        border-style: solid;
+        border-width: 1px;
+        border-color: inherit;
+}
+
+.cm-tw-underline {
+        text-decoration: underline;
+}
\ No newline at end of file