Commit e69fb7ac340fb612ec33fedfc14e89dd7ff75028

Authored by Amrita Vishnoi
2 parents 9ba62fe9 d32b596a

Merge branch 'PenAlignment' into Develop

400-SOURCECODE/AIAHTML5.Web/index.html
... ... @@ -506,8 +506,8 @@
506 506 <div>
507 507 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" id="paintLine" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></button>
508 508 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
509   - <div class="marginL2 pull-left"><input type="number" id="amount-2" step="1" style="width:60px;" min="1" max="60" oninput="Brushsize(this)"></div>&nbsp;
510   - <div class="pull-left" style="width:45%; margin-left:2%;">
  509 + <div class="marginL2 pull-left"><input type="number" id="amount-2" step="1" style="width:60px;height:21px;" min="1" max="60" oninput="Brushsize(this)"></div>&nbsp;
  510 + <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
511 511 <div id="slider-range-min-2"></div>
512 512 </div>
513 513 <div class="clearfix"></div>
... ...