about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2018-01-12 23:52:41 -0500
committerGitHub <noreply@github.com>2018-01-12 23:52:41 -0500
commit9526aababc3232e4e10d4c7cbb6e357a4b3e5431 (patch)
tree305e032f6423812fa5d4c48ed8bb5666db1b1e53
parent0210e5975913b245c50f57606b234ed773e47220 (diff)
parent3a0b47982d3dcb16ba92e9c7e981cb2249e69eca (diff)
Merge pull request #324 from glitch-soc/load-public-on-admin
Load public javascripts on admin pages
-rw-r--r--app/javascript/flavours/glitch/theme.yml2
-rw-r--r--app/javascript/flavours/vanilla/theme.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 8ccd8fa65..100e89e3e 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -1,7 +1,7 @@
 #  (REQUIRED) The location of the pack files.
 pack:
   about: packs/about.js
-  admin:
+  admin: packs/public.js
   auth:
   common:
     filename: packs/common.js
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 0b27c31bb..6f6a32c37 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -1,7 +1,7 @@
 #  (REQUIRED) The location of the pack files inside `pack_directory`.
 pack:
   about: about.js
-  admin:
+  admin: public.js
   auth:
   common:
     filename: common.js