ADAM / AIAHTML5

Commit 219afcedcb8c080cad5064963aeb61e31162d378

Authored by Amrita Vishnoi
2 parents 65009239 3e7c3726

Merge branch 'brushiconblack' into Develop

Inline Side-by-side
Showing 3 changed files with 21 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @219afce
... ... @@ -392,6 +392,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
392 392  
393 393 }
394 394  
  395 + $('.btnCursor').removeClass('activebtncolor');
  396 + $(".btn-annotation").removeClass("activebtncolor");
  397 + $(".btn-annotation-brush").addClass("activebtncolor");
395 398  
396 399 }
397 400  
... ... @@ -465,6 +468,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
465 468 $rootScope.switchCanvas();
466 469 $rootScope.isEraseToolSelected = true;
467 470 //$rootScope.switchCanvasToPaintCanvas();
  471 + $('.btnCursor').removeClass('activebtncolor');
  472 + $(".btn-annotation").removeClass("activebtncolor");
  473 + $(".btn-annotation-erase").addClass("activebtncolor");
468 474 }
469 475  
470 476  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @219afce
... ... @@ -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 @219afce
... ... @@ -945,3 +945,16 @@ background-size:cover;
945 945 background:#4b4b4b !important;
946 946 border-color:#3f3f3f !important;
947 947 }
  948 +.btn-annotation-erase:hover
  949 + {
  950 + color: #fff;
  951 + }
  952 + .btn-annotation-brush:hover
  953 + {
  954 + color: #fff;
  955 + }
  956 + .fa-eraser,.fa-paint-brush
  957 + {
  958 + color: #fff;
  959 + }
  960 +
948 961 \ No newline at end of file
... ...