From: kashalkar <kiran.kashalkar@riftio.com>
Date: Thu, 5 Oct 2017 16:05:36 +0000 (+0200)
Subject: Merge "Added reset-css node module to fix styling"
X-Git-Tag: v3.0.0^0
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=4338a52d3023a9fdd570e6991da36c82fbb342c9;hp=16d71de0bcf7caf9dfc600f939ea1ae877eefb60

Merge "Added reset-css node module to fix styling"
---

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",