Adjusted fountain preview 🌸

- Replaced old Fountain CSS with one presumably created by @kmwallio - Adjusted markdown and fountain HTMLs
fairybow · Feb 3, 2023 · b3ab7c9 · b3ab7c9
1 parent d89722d
commit b3ab7c9
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 316 deletions.
diff --git a/fernanda/docs/todo.md b/fernanda/docs/todo.md
@@ -1,6 +1,7 @@
 # To-Do
 
 ## General
+- [ ] Export All vs Export Selected/Single
 - [ ] Ability to "mark" files as countable/compilable, for both exporting a draft and calculating totals
 - [ ] Installer script needs to detect if Fernanda is running
 - [ ] Moveable documents folder
@@ -125,6 +126,10 @@
 ### Popup
 - [ ] Ensure popups happen on the same monitor...
 
+### Preview
+- [ ] Replace fountain CSS
+- [ ] Minify fountain CSS
+
 ### StartCop
 - [ ] Accept args (on file click, prompt to save if needed and open new file; possibly also switch to dev mode)
 

diff --git a/fernanda/res/preview.qrc b/fernanda/res/preview.qrc
@@ -4,8 +4,8 @@
         <file>preview/fountain-overwrite.css</file>
         <file>preview/markdown.html</file>
         <file>preview/markdown-overwrite.css</file>
+        <file>preview/include/fountain.min.css</file>
         <file>preview/include/fountain.min.js</file>
-        <file>preview/include/fountain-js.css</file>
         <file>preview/include/github-markdown.min.css</file>
         <file>preview/include/github-markdown-dark.min.css</file>
         <file>preview/include/github-markdown-light.min.css</file>

diff --git a/fernanda/res/preview/fountain-overwrite.css b/fernanda/res/preview/fountain-overwrite.css
@@ -1,2 +1,7 @@
 body {
+    background-color: ivory;
+    color: #444;
+    font-family: Courier New, Courier, monospace;
+    padding-left: 2em;
+    padding-right: 2em;
 }
diff --git a/fernanda/res/preview/fountain.html b/fernanda/res/preview/fountain.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <html lang="en">
 <head>
-    <link rel="stylesheet" href="include/fountain-js.css">
+    <link rel="stylesheet" href="include/fountain.min.css">
     <link rel="stylesheet" href="fountain-overwrite.css">
     <script src="include/fountain.min.js"></script>
     <script src="qrc:/qtwebchannel/qwebchannel.js"></script>
@@ -14,10 +14,10 @@
         var text_area = document.getElementById('text_area');
         var updateText = function (text) {
             var output = fountain.parse(text);
-            text_area.innerHTML = output.html.title_page + output.html.script;
+            text_area.innerHTML = '<div id="script">' + output.html.title_page + '<p>' + output.html.script + '</div>';
         }
         new QWebChannel(qt.webChannelTransport,
-            function(channel) {
+            function (channel) {
                 var content = channel.objects.content;
                 updateText(content.text);
                 content.textChanged.connect(updateText);

diff --git a/fernanda/res/preview/include/fountain-js.css b/fernanda/res/preview/include/fountain-js.css
diff --git a/fernanda/res/preview/include/fountain.min.css b/fernanda/res/preview/include/fountain.min.css
diff --git a/fernanda/res/preview/include/fountain.min.js b/fernanda/res/preview/include/fountain.min.js
diff --git a/fernanda/res/preview/include/marked.min.js b/fernanda/res/preview/include/marked.min.js
diff --git a/fernanda/res/preview/markdown-overwrite.css b/fernanda/res/preview/markdown-overwrite.css
@@ -1,2 +1,3 @@
 body {
+    background-color: ghostwhite;
 }