From 179d71f0e14bd3892f4ddac11eeb57fd75a618ea Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Tue, 19 May 2015 09:15:16 +0100 Subject: [PATCH] Remove extra ember container --- ghost/admin/app/index.html | 10 ++++++---- ghost/admin/app/styles/layouts/main.css | 4 ++-- ghost/admin/app/views/application.js | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ghost/admin/app/index.html b/ghost/admin/app/index.html index 7ded6776d5..e194d1b5dc 100644 --- a/ghost/admin/app/index.html +++ b/ghost/admin/app/index.html @@ -41,14 +41,16 @@ + {{content-for 'head-footer'}} - {{content-for 'body'}} +{{content-for 'body'}} - - +{{content-for 'body-footer'}} - {{content-for 'body-footer'}} +{{! Dem scripts }} + + diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css index 1c8d7bccf5..dc2cb5f188 100644 --- a/ghost/admin/app/styles/layouts/main.css +++ b/ghost/admin/app/styles/layouts/main.css @@ -2,7 +2,7 @@ /* ---------------------------------------------------------- */ /* Main viewport, contains main content, and alerts */ -.gh-viewport { +.gh-app { display: flex; flex-direction: column; overflow: hidden; @@ -10,7 +10,7 @@ } /* Content viewport, contains everything else */ -.gh-viewport-container { +.gh-viewport { flex-grow: 1; display: flex; } diff --git a/ghost/admin/app/views/application.js b/ghost/admin/app/views/application.js index 1fa5a3d72e..39ce9025fb 100644 --- a/ghost/admin/app/views/application.js +++ b/ghost/admin/app/views/application.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import mobileQuery from 'ghost/utils/mobile'; var ApplicationView = Ember.View.extend({ - elementId: 'container', + classNames: 'gh-app', didInsertElement: function () { // #### Navigating within the sidebar closes it.