From f03fcc04d79650c9185f75c83ea7b432a5c48393 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 8 Nov 2018 16:13:20 -0500 Subject: [PATCH 1/2] remove unnecessary file --- site/client_custom/scss/body/_body.scss | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 site/client_custom/scss/body/_body.scss diff --git a/site/client_custom/scss/body/_body.scss b/site/client_custom/scss/body/_body.scss deleted file mode 100644 index 90f22258..00000000 --- a/site/client_custom/scss/body/_body.scss +++ /dev/null @@ -1,10 +0,0 @@ -body { - margin: 0; - padding: 0; - height: 100%; - word-wrap: break-word; - display: -webkit-flex; - display: flex; - -webkit-flex-direction: column; - flex-direction: column; -} -- 2.45.2 From 074e88b2680855eeb2818d35f14b9fc1fba5deb1 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Thu, 8 Nov 2018 16:14:31 -0500 Subject: [PATCH 2/2] move pages to last in route order --- server/routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/routes/index.js b/server/routes/index.js index 71223948..89cbbb01 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -1,7 +1,7 @@ module.exports = { - ...require('./pages'), ...require('./api'), ...require('./auth'), ...require('./assets'), ...require('./fallback'), + ...require('./pages'), }; -- 2.45.2