ADAM / AIAHTML5

Commit 3e7c37266defff4564f0315b843478dd2dfa31b1

Authored by Mukul Rajput
1 parent 316f0f48

this is for erase button and brush icon must be black

Inline Side-by-side
Showing 3 changed files with 21 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3e7c372
... ... @@ -386,6 +386,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
386 386  
387 387 }
388 388  
  389 + $('.btnCursor').removeClass('activebtncolor');
  390 + $(".btn-annotation").removeClass("activebtncolor");
  391 + $(".btn-annotation-brush").addClass("activebtncolor");
389 392  
390 393 }
391 394  
... ... @@ -459,6 +462,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
459 462 $rootScope.switchCanvas();
460 463 $rootScope.isEraseToolSelected = true;
461 464 //$rootScope.switchCanvasToPaintCanvas();
  465 + $('.btnCursor').removeClass('activebtncolor');
  466 + $(".btn-annotation").removeClass("activebtncolor");
  467 + $(".btn-annotation-erase").addClass("activebtncolor");
462 468 }
463 469  
464 470  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @3e7c372
... ... @@ -534,8 +534,8 @@
534 534 <div class="well well-popup">
535 535 <div class="" role="group" aria-label="...">
536 536 <div>
537   - <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
538   - <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>&nbsp;
  537 + <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
  538 + <button type="button" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>&nbsp;
539 539 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
540 540 <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()">
541 541 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @3e7c372
... ... @@ -944,3 +944,16 @@ background-size:cover;
944 944 background:#4b4b4b !important;
945 945 border-color:#3f3f3f !important;
946 946 }
  947 +.btn-annotation-erase:hover
  948 + {
  949 + color: #fff;
  950 + }
  951 + .btn-annotation-brush:hover
  952 + {
  953 + color: #fff;
  954 + }
  955 + .fa-eraser,.fa-paint-brush
  956 + {
  957 + color: #fff;
  958 + }
  959 +
947 960 \ No newline at end of file
... ...