From 168a832c103efe72c45d67cc8845eff72684966c Mon Sep 17 00:00:00 2001 From: James Mason Date: Fri, 16 Mar 2018 16:21:59 -0700 Subject: [PATCH] Move modals content area to main layout --- app/views/conferences/show.html.haml | 2 -- app/views/layouts/application.html.haml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 283d5e00..461c23d9 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -53,8 +53,6 @@ = render 'social_media', contact: @conference.contact = render 'footer' - = yield :modals - - cache [@conference.color, '#splash#inlinejs'] do - content_for :script_head do :javascript diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 128f491a..60c56307 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -32,6 +32,9 @@ = render 'layouts/messages' #content = yield + + = yield :modals + #footer .container %p.muted.text-center