ADAM / AIAHTML5

Commit ccc315700530243a2cb45ae2a010984416a2b47e

Authored by Amrita Vishnoi
2 parents c16b1fde 9eeccea8

Merge branch 'Bugs_v17' into Develop

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ccc3157
@@ -544,12 +544,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -544,12 +544,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
544 544
545 545
546 $rootScope.disableAnnotationToolBar = function () { 546 $rootScope.disableAnnotationToolBar = function () {
547 - 547 +
  548 + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)");
  549 + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)");
548 document.getElementById('modelbackground').style.display = "none"; 550 document.getElementById('modelbackground').style.display = "none";
549 document.getElementById('modeleditstyle').style.display = "none"; 551 document.getElementById('modeleditstyle').style.display = "none";
550 //Edit Shape Style popup should open at it's default position 552 //Edit Shape Style popup should open at it's default position
551 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); 553 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
552 - 554 +
553 } 555 }
554 556
555 557
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ccc3157
@@ -1547,8 +1547,7 @@ @@ -1547,8 +1547,7 @@
1547 slide: function (event, ui) { 1547 slide: function (event, ui) {
1548 1548
1549 $(".marginTopBtm10 .imgopacity").css("opacity", ui.value); 1549 $(".marginTopBtm10 .imgopacity").css("opacity", ui.value);
1550 - // $("#slider-value").html(ui.value);  
1551 - 1550 + $(".marginTopBtm10 div.outlinediv").css("opacity", ui.value);
1552 } 1551 }
1553 1552
1554 } 1553 }