about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-01-20 15:00:22 +0100
committerThibaut Girka <thib@sitedethib.com>2020-01-20 15:00:22 +0100
commit45709d6987db87b38e5a16c18ea3b2d9e55fba98 (patch)
tree854dcee1c7c85f518f46616f1a2b6af87df77c5b /app/views/layouts
parentddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff)
parent51182843d49d04621c3d3069f44f365fd9f415e5 (diff)
Merge branch 'master' into glitch-soc/master
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/admin.html.haml3
-rw-r--r--app/views/layouts/embedded.html.haml4
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 10fa42e8b..ec3629dd8 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = render_initial_state
+
 - content_for :content do
   .admin-wrapper
     .sidebar-wrapper
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 33e3714f8..6695b12dd 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -10,6 +10,7 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
+    = render_initial_state
     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
@@ -21,3 +22,6 @@
 
   %body.embed
     = yield
+
+    %div{ style: 'display: none'}
+      = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')