Commit 7ecb416999547c68362d13b5e90a6835a05dd8a0

Authored by Nikita Kulshreshtha
2 parents f741236c 6870c7d4

Merge branch 'AnnotationEditTextMissing' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -8610,6 +8610,9 @@ function OnIdentityClick() { @@ -8610,6 +8610,9 @@ function OnIdentityClick() {
8610 8610
8611 function OnZoom() 8611 function OnZoom()
8612 { 8612 {
  8613 + //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
  8614 + $(".com").remove();
  8615 + $("#bord").remove();
8613 console.log('OnZoom is called outside '); 8616 console.log('OnZoom is called outside ');
8614 var scope = angular.element(document.getElementById("daView")).scope(); 8617 var scope = angular.element(document.getElementById("daView")).scope();
8615 scope.$apply(function () { 8618 scope.$apply(function () {
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -45,7 +45,15 @@ @@ -45,7 +45,15 @@
45 /*.ActiveDefaultColorAnnotation { 45 /*.ActiveDefaultColorAnnotation {
46 background-color: #000000!important; 46 background-color: #000000!important;
47 }*/ 47 }*/
48 - .ActiveFormattingButtonClass { 48 +
  49 +
  50 + #termList option:hover {
  51 + background-color: #3399FF;
  52 + color:#fff;
  53 + }
  54 +
  55 +
  56 + .ActiveFormattingButtonClass {
49 background-color: #1B92D0 !important; 57 background-color: #1B92D0 !important;
50 } 58 }
51 59