Favicon and hjs cleanup

AnswerDotAI · Dec 28, 2024 · bd6392b · bd6392b
1 parent c609675
commit bd6392b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/main.py b/docs/main.py
@@ -6,7 +6,10 @@
 from pathlib import Path
 
 # Setup the app
-app,rt = fast_app(pico=False, hdrs=(*Theme.blue.headers(),*hjs))
+
+
+
+app,rt = fast_app(pico=False, hdrs=(*Theme.blue.headers(),*hjs, Link(rel="icon", type="image/x-icon", href="/favicon.ico")))
 
 def is_htmx(request=None): 
     "Check if the request is an HTMX request"

diff --git a/docs/utils.py b/docs/utils.py
@@ -14,28 +14,30 @@ def get_last_statement(code): return ast.unparse(ast.parse(code).body[-1])
 from pathlib import Path
 
 
-hjs = (Style('html.dark .hljs-copy-button {background-color: #e0e0e0; color: #2d2b57;}'),
+hjs = (Style(''' .hljs-copy-button {background-color: #2d2b57;}
+             html.dark .hljs-copy-button {background-color: #e0e0e0; color: #2d2b57;}'''),
                 Link(rel='stylesheet', href='https://cdn.jsdelivr.net/gh/highlightjs/cdn-release/build/styles/atom-one-dark.css', disabled=True),
                 Link(rel='stylesheet', href='https://cdn.jsdelivr.net/gh/highlightjs/cdn-release/build/styles/atom-one-light.css', disabled=True),
                 Script(src='https://cdn.jsdelivr.net/gh/highlightjs/cdn-release/build/highlight.min.js'),
                 Script(src='https://cdn.jsdelivr.net/gh/arronhunt/highlightjs-copy/dist/highlightjs-copy.min.js'),
                 Link(rel='stylesheet', href='https://cdn.jsdelivr.net/gh/arronhunt/highlightjs-copy/dist/highlightjs-copy.min.css'),
-                Style('.hljs-copy-button {background-color: #2d2b57;}'),
                 Script(src='https://cdn.jsdelivr.net/gh/highlightjs/cdn-release/build/languages/python.min.js'),
-                Script("hljs.addPlugin(new CopyButtonPlugin());\r\nhljs.configure({'cssSelector': 'pre code'});\r\nhtmx.onLoad(hljs.highlightAll);", type='module'),
-                Script('''htmx.on("htmx:beforeHistorySave", () => {document.querySelectorAll("uk-icon").forEach((elt) => {elt.innerHTML = '';});});'''),
-
-                Script('''hljs.configure({
-                    ignoreUnescapedHTML: true
-                });'''),
-                Script('''const observer = new MutationObserver(mutations => {
-                          mutations.forEach(mutation => {
-                            if (mutation.target.tagName === 'HTML' && mutation.attributeName === 'class') {
-                              const isDark = mutation.target.classList.contains('dark');
-                              document.querySelector('link[href*="atom-one-dark.css"]').disabled = !isDark;
-                              document.querySelector('link[href*="atom-one-light.css"]').disabled = isDark;
-                            }
-                          });
+                Script('''
+                        hljs.addPlugin(new CopyButtonPlugin());
+                        hljs.configure({
+                            cssSelector: 'pre code',
+                            ignoreUnescapedHTML: true
+                        });
+                        htmx.onLoad(hljs.highlightAll);
+
+                        const observer = new MutationObserver(mutations => {
+                            mutations.forEach(mutation => {
+                                if (mutation.target.tagName === 'HTML' && mutation.attributeName === 'class') {
+                                    const isDark = mutation.target.classList.contains('dark');
+                                    document.querySelector('link[href*="atom-one-dark.css"]').disabled = !isDark;
+                                    document.querySelector('link[href*="atom-one-light.css"]').disabled = isDark;
+                                }
+                            });
                         });
 
                         observer.observe(document.documentElement, { attributes: true });
@@ -44,7 +46,7 @@ def get_last_statement(code): return ast.unparse(ast.parse(code).body[-1])
                         const isDark = document.documentElement.classList.contains('dark');
                         document.querySelector('link[href*="atom-one-dark.css"]').disabled = !isDark;
                         document.querySelector('link[href*="atom-one-light.css"]').disabled = isDark;
-                        '''))
+                    ''', type='module'))
 
 def create_flippable_card(content, source_code, extra_cls=None):
     "Creates a card that flips between content and source code"
@@ -57,7 +59,7 @@ def create_flippable_card(content, source_code, extra_cls=None):
             DivFullySpaced(UkIcon('corner-down-right', 20, 20, 3),"See Output"), 
             uk_toggle=f"target: #{_id}", id=_id, cls=ButtonT.primary, hidden=True),
         Div(content, id=_id),
-        Div(Pre(Code(source_code, cls="hljs language-python")), id=_id, hidden=True, cls="mockup-code"),
+        Div(Pre(Code(source_code, cls="hljs language-python")), id=_id, hidden=True),#, cls="mockup-code"
         cls='my-8')
     return Div(_card, cls=extra_cls) if extra_cls else _card