Business/SiteWriter
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Override more styles to fix TinyMCE/theme CSS conflicts

Browse Source
This commit is contained in:
Skylar Ittner 2018-05-16 14:05:03 -06:00
parent 6857363894
commit 14fb789632
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.php
View File

@ -38,9 +38,8 @@ if (isset($_GET['edit'])) {
$allpages[$i]["value"] = get_page_clean_url(false, $allpages[$i]["value"]); $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/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 src="<?php echo URL; ?>/static/js/tinymce/tinymce.min.js"></script>
<script> <script>
static_dir = "<?php echo URL; ?>/static"; static_dir = "<?php echo URL; ?>/static";

20
static/css/editor.css
View File

@ -16,9 +16,25 @@ input[type="text"].sw-text-input {
border: 2px dashed red !important; border: 2px dashed red !important;
} }
button.note-btn, .note-modal button { button.note-btn, .note-modal button, .mce-widget button, .mce-menubtn button, .mce-btn button, button.mce-close {
box-shadow: none; box-shadow: none !important;
color: #333 !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 { .note-modal .close {

2
static/js/editor.js
View File

@ -38,7 +38,7 @@ $(document).ready(function () {
e.preventDefault(); 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 () { $(".sw-editable").each(function () {
// Remove leading whitespace added by the template // Remove leading whitespace added by the template