Commit ed4758e50492edd998173b0f2ff21e91092d2889
Merge branch 'overlapbrushissue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
Showing
2 changed files
with
6 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/index.html
| ... | ... | @@ -682,7 +682,7 @@ |
| 682 | 682 | </div> |
| 683 | 683 | |
| 684 | 684 | |
| 685 | - <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> | |
| 685 | + <div class="pull-left pl-12" style="width:45%; margin-left:2%;margin-top:5px;"> | |
| 686 | 686 | <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div> |
| 687 | 687 | </div> |
| 688 | 688 | <div class="clearfix"></div> |
| ... | ... | @@ -940,14 +940,14 @@ |
| 940 | 940 | <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity"> |
| 941 | 941 | <div class="row"> |
| 942 | 942 | <label class="pull-left" style="font-weight:normal;">Scale</label> |
| 943 | - <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;"> | |
| 943 | + <div id="edit-slider-3" class="pull-left pl-12" style="width:62%; margin-left:3%; margin-top:2%;"> | |
| 944 | 944 | <div id="slider-range-min-3"></div> |
| 945 | 945 | </div> |
| 946 | 946 | </div> |
| 947 | 947 | |
| 948 | 948 | <div class="row"> |
| 949 | 949 | <label class="pull-left" style="font-weight:normal;">Opacity</label> |
| 950 | - <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;"> | |
| 950 | + <div id="edit-slider-4" class="pull-left pl-12" style="width:53%; margin-left:3%; margin-top:2%;"> | |
| 951 | 951 | <div id="slider-range-min-4"></div> |
| 952 | 952 | </div> |
| 953 | 953 | </div> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css