From: seshukm <seshu.kumar.m@huawei.com>
Date: Tue, 4 Apr 2017 06:30:29 +0000 (+0530)
Subject: images added to the framework
X-Git-Tag: release/mercury~52
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=416a3ade21c5d1692259988050193f40cdbddf0b;p=vnfsdk%2Frefrepo.git

images added to the framework

ISSUEID : CLIENT-189

Change-Id: Ifa74c349c7306190fa4de0079e4e7b86d478d7e9
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---

diff --git a/common/src/main/webapp/framework/browser/thirdparty/images/delete.png b/common/src/main/webapp/framework/browser/thirdparty/images/delete.png
new file mode 100644
index 00000000..737f8797
Binary files /dev/null and b/common/src/main/webapp/framework/browser/thirdparty/images/delete.png differ
diff --git a/common/src/main/webapp/framework/browser/thirdparty/images/edit.png b/common/src/main/webapp/framework/browser/thirdparty/images/edit.png
new file mode 100644
index 00000000..68d76257
Binary files /dev/null and b/common/src/main/webapp/framework/browser/thirdparty/images/edit.png differ
diff --git a/resmgr/src/main/webapp/resmgr/css/style.css b/resmgr/src/main/webapp/resmgr/css/style.css
index 97faca8a..76865689 100644
--- a/resmgr/src/main/webapp/resmgr/css/style.css
+++ b/resmgr/src/main/webapp/resmgr/css/style.css
@@ -14,7 +14,7 @@
  */
  
 
-.containerheight{
+.containerh{
 	background-color:white !important;
 	min-height:500px;
 
diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html
index b0e82587..2e3551c9 100644
--- a/resmgr/src/main/webapp/resmgr/index.html
+++ b/resmgr/src/main/webapp/resmgr/index.html
@@ -32,9 +32,7 @@
     <!--<link rel="stylesheet" href="framework/css/RMain.css">
     <link rel="stylesheet" href="framework/css/VMMain.css">-->
     <link href="/openoui/framework/css/open-ostyle.css" rel="stylesheet"/>
-	  <link href="/openoui/resmgr/css/style.css" rel="stylesheet"/>
-    <!--<link href="css/style.css" rel="stylesheet"/>-->
-
+    
     <!--TODO: <script src="../common/thirdparty/js/angular.min.js"></script>-->
     <script type="text/javascript" src="/openoui/thirdparty/js/angular.min.js"></script>
     <script type="text/javascript" src="/openoui/thirdparty/js/angular-ui-router.min.js"></script>
@@ -45,6 +43,7 @@
     <script type="text/javascript" src="/openoui/thirdparty/js/jquery-ui.js"></script>
     <script type="text/javascript" src="/openoui/thirdparty/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="/openoui/thirdparty/js/mustache.js"></script>
+	<link href="/openoui/resmgr/css/style.css" rel="stylesheet"/>
     <script type="text/javascript" src="/openoui/resmgr/js/app.js"></script>
     <script type="text/javascript" src="/openoui/resmgr/js/DataService.js"></script>
     <script type="text/javascript" src="/openoui/resmgr/sdn-resmgr/link/linkRest.js"></script>