From 15683ca164319e80896a2d4ff314f889679198d6 Mon Sep 17 00:00:00 2001
From: Mukul <mukul@ebix.com>
Date: Tue, 13 Sep 2016 11:26:26 +0530
Subject: [PATCH] #7642 , #6200

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js |  7 +++++--
 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html         | 17 ++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 6a2147f..1c3529f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -297,6 +297,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.shapestyle = function (id) {
 
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
 
             $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
             $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -319,15 +320,17 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         }
 
         $rootScope.enableAnnotationToolBar = function () {
-
+           
             document.getElementById('modelbackground').style.display = "block";
-            $("#editshapestyle").modal('show');
+            //$("#editshapestyle").modal('show');
+            document.getElementById('modeleditstyle').style.display = "block";
 
         }
 
         $rootScope.disableAnnotationToolBar = function () {
 
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
 
         }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 5141c95..b07b792 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -55,19 +55,18 @@
         display: none;
     }
     .customTooltip {
-        background-color: #fff !important;
-        color: #000 !important;
+        background: #333 !important;
+        color: #fff !important;
         opacity: 0.9 !important;
-       
     }
 
 
 
 
     .custom-tooltip {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         left: -52px;
         opacity: 0.9;
         padding: 7px;
@@ -83,9 +82,9 @@
     }
 
     .custom-tooltip1 {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         left: 52px;
         opacity: 0.9;
         padding: 7px;
@@ -101,9 +100,9 @@
     }
 
     .custom-tooltip2 {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         right: 10px;
         opacity: 0.9;
         padding: 7px;
--
libgit2 0.21.4