Commit e50bf7304d8f63afbff987eb7f8e9b042c3f05e8
Merge branch 'Z-IndexIssue' into Develop
Showing
2 changed files
with
6 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -453,7 +453,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 453 | 453 | $("#DrawMode").addClass("annotationtoolbartab"); |
| 454 | 454 | $('.btnCursor').addClass('activebtncolor'); |
| 455 | 455 | $rootScope.switchCanvas(); |
| 456 | - | |
| 456 | + $("#annotationpaintbrushsize").removeClass("activebtncolor"); | |
| 457 | + $("#annotationpainteraser").removeClass("activebtncolor"); | |
| 458 | + $rootScope.isEraseToolSelected = false; | |
| 457 | 459 | // $("#canvasPaint").css("display", "block"); |
| 458 | 460 | // $("#canvas").css("display", "block"); |
| 459 | 461 | |
| ... | ... | @@ -651,6 +653,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 651 | 653 | $('.btnCursor').removeClass('activebtncolor'); |
| 652 | 654 | $(".btn-annotation").removeClass("activebtncolor"); |
| 653 | 655 | $(".btn-annotation-erase").addClass("activebtncolor"); |
| 656 | + | |
| 654 | 657 | } |
| 655 | 658 | |
| 656 | 659 | $rootScope.isShapeSyleOkBtnClicked = false; | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
| ... | ... | @@ -871,7 +871,7 @@ |
| 871 | 871 | <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;"> |
| 872 | 872 | |
| 873 | 873 | |
| 874 | - <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;"> | |
| 874 | + <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;float:left;"> | |
| 875 | 875 | <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span> |
| 876 | 876 | <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc"> |
| 877 | 877 | </div> |
| ... | ... | @@ -916,7 +916,7 @@ |
| 916 | 916 | <div class="col-sm-6 setEnableDisableForEditShapeStyle"> |
| 917 | 917 | <label class="marginTop5"> |
| 918 | 918 | <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span> |
| 919 | - <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;"> | |
| 919 | + <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;float:left;"> | |
| 920 | 920 | |
| 921 | 921 | <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc"> |
| 922 | 922 | </div> | ... | ... |