Commit 9c2ad1d74822c6e1318687c278d685671d0f353e
Merge branch 'ColorIssueInEditPopup' into Develop
Showing
3 changed files
with
11 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -506,6 +506,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -506,6 +506,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
| 506 | else { | 506 | else { |
| 507 | document.getElementById('modelbackground').style.display = "block"; | 507 | document.getElementById('modelbackground').style.display = "block"; |
| 508 | document.getElementById('modeleditstyle').style.display = "block"; | 508 | document.getElementById('modeleditstyle').style.display = "block"; |
| 509 | + | ||
| 510 | + // alert(document.getElementById('outlinedivId').style.border); | ||
| 511 | + // alert(document.getElementById('imgOpacity').style.backgroundColor); | ||
| 512 | + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", document.getElementById('imgOpacity').style.backgroundColor); | ||
| 513 | + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", document.getElementById('outlinedivId').style.border); | ||
| 514 | + | ||
| 509 | if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing | 515 | if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing |
| 510 | var previewOpacity = $('#imgOpacity').css("opacity"); | 516 | var previewOpacity = $('#imgOpacity').css("opacity"); |
| 511 | $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%"); | 517 | $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%"); |
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -524,8 +524,8 @@ | @@ -524,8 +524,8 @@ | ||
| 524 | <!--#7931--> | 524 | <!--#7931--> |
| 525 | 525 | ||
| 526 | <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> | 526 | <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> |
| 527 | - <div class="outlinediv" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> | ||
| 528 | - <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> | 527 | + <div class="outlinediv" style="border: 1px solid #000000;" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> |
| 528 | + <div id="shapeStyleDiv" style="background-color: #ffffff;" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> | ||
| 529 | 529 | ||
| 530 | </div> | 530 | </div> |
| 531 | 531 | ||
| @@ -877,8 +877,8 @@ | @@ -877,8 +877,8 @@ | ||
| 877 | <div class="marginTopBtm10"> | 877 | <div class="marginTopBtm10"> |
| 878 | 878 | ||
| 879 | <div class="well well-sm no-margin-btm blankshapediv"> | 879 | <div class="well well-sm no-margin-btm blankshapediv"> |
| 880 | - <div class="outlinediv"> | ||
| 881 | - <div id="imgOpacity" class="fullcolordiv imgopacity"> | 880 | + <div class="outlinediv" id="outlinedivId" style="border: 1px solid #000000;"> |
| 881 | + <div id="imgOpacity" style="background-color: #ffffff" class="fullcolordiv imgopacity"> | ||
| 882 | </div> | 882 | </div> |
| 883 | </div> | 883 | </div> |
| 884 | </div> | 884 | </div> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
| @@ -919,7 +919,7 @@ background-size:cover; | @@ -919,7 +919,7 @@ background-size:cover; | ||
| 919 | } | 919 | } |
| 920 | .outlinediv | 920 | .outlinediv |
| 921 | { | 921 | { |
| 922 | - border:1px solid black; | 922 | + /*border:1px solid black;*/ |
| 923 | width: 72%; | 923 | width: 72%; |
| 924 | margin-left: auto; | 924 | margin-left: auto; |
| 925 | margin-right: auto; | 925 | margin-right: auto; |