From 14fb78963211858fa257a5d8edf8baecdca4ad2d Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Wed, 16 May 2018 14:05:03 -0600
Subject: [PATCH] Override more styles to fix TinyMCE/theme CSS conflicts

---
 public/index.php      |  3 +--
 static/css/editor.css | 20 ++++++++++++++++++--
 static/js/editor.js   |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/public/index.php b/public/index.php
index 11898fa..fe7bbb1 100644
--- a/public/index.php
+++ b/public/index.php
@@ -38,9 +38,8 @@ if (isset($_GET['edit'])) {
         $allpages[$i]["value"] = get_page_clean_url(false, $allpages[$i]["value"]);
     }
     ?>
-    <style><?php echo str_replace("./font/summernote", "../static/fonts/summernote", file_get_contents(__DIR__ . "/../static/css/summernote-lite.css")); ?></style>
+    <style><?php echo file_get_contents(__DIR__ . "/../static/css/editor.css"); ?></style>
     <script src="<?php echo URL; ?>/static/js/jquery-3.3.1.min.js"></script>
-    <!--<script src="<?php echo URL; ?>/static/js/summernote-lite.js"></script>-->
     <script src="<?php echo URL; ?>/static/js/tinymce/tinymce.min.js"></script>
     <script>
         static_dir = "<?php echo URL; ?>/static";
diff --git a/static/css/editor.css b/static/css/editor.css
index 5c8d43e..146a49f 100644
--- a/static/css/editor.css
+++ b/static/css/editor.css
@@ -16,9 +16,25 @@ input[type="text"].sw-text-input {
     border: 2px dashed red !important;
 }
 
-button.note-btn, .note-modal button {
-    box-shadow: none;
+button.note-btn, .note-modal button, .mce-widget button, .mce-menubtn button, .mce-btn button, button.mce-close {
+    box-shadow: none !important;
     color: #333 !important;
+    text-transform: none;
+    letter-spacing: normal;
+    transition: none;
+}
+
+.mce-btn.mce-primary button {
+    color: white !important;
+}
+
+.mce-btn.mce-active button, .mce-btn.mce-active:hover button, .mce-btn.mce-active i, .mce-btn.mce-active:hover {
+    color: white !important;
+}
+
+.mce-label {
+    text-transform: none;
+    letter-spacing: normal;
 }
 
 .note-modal .close {
diff --git a/static/js/editor.js b/static/js/editor.js
index 26b97ec..4c27871 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -38,7 +38,7 @@ $(document).ready(function () {
         e.preventDefault();
     });
 
-    $("body").append("<link href=\"" + static_dir + "/css/editor.css\" rel=\"stylesheet\" />");
+    //$("body").append("<link href=\"" + static_dir + "/css/editor.css\" rel=\"stylesheet\" />");
 
     $(".sw-editable").each(function () {
         // Remove leading whitespace added by the template