From b6521311f553c8781861a9f44987c485e5bfab9c Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Thu, 5 Oct 2017 10:28:55 -0400 Subject: [PATCH] Added reset-css node module to fix styling Signed-off-by: Laurence Maultsby --- skyquake/framework/style/core.css | 4 ++-- skyquake/package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/skyquake/framework/style/core.css b/skyquake/framework/style/core.css index e9d5de9cf..0944e15d7 100644 --- a/skyquake/framework/style/core.css +++ b/skyquake/framework/style/core.css @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +15,7 @@ * limitations under the License. * */ -/*@import "./vendor/css-reset-2.0/css-reset.css";*/ + @import "../../node_modules/reset-css/reset.css"; .has-drop-shadow { box-shadow: 2px 2px rgba(0, 0, 0, .15) } diff --git a/skyquake/package.json b/skyquake/package.json index df8304147..340357d5f 100644 --- a/skyquake/package.json +++ b/skyquake/package.json @@ -47,6 +47,7 @@ "request-promise": "^3.0.0", "require-json": "0.0.1", "require-reload": "^0.2.2", + "reset-css": "^2.2.1", "sockjs": "^0.3.17", "sockjs-client": "^1.1.1", "underscore": "^1.8.3", -- 2.17.1