ADAM / AIAHTML5

Commit 9719344defe59c761142869c3d1c74e2e8799512

Authored by Nikita Kulshreshtha
2 parents ad7eef91 518ae30e

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @9719344
@@ -660,7 +660,8 @@ @@ -660,7 +660,8 @@
660 <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp; 660 <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp;
661 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> 661 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
662 <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"> 662 <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()">
663 - <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="rese 663 + <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
  664 + </div>
664 <div style="width: 22px; float: left;"> 665 <div style="width: 22px; float: left;">
665 <div style="width: 100%; float: left; height: 16px;"> 666 <div style="width: 100%; float: left; height: 16px;">
666 <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 667 <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
@@ -677,6 +678,7 @@ @@ -677,6 +678,7 @@
677 678
678 </div> 679 </div>
679 680
  681 +
680 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> 682 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
681 <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div> 683 <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div>
682 </div> 684 </div>