Commit a2f46b0aa600b5e1514cfc966ec8bc572e5619e4
1 parent
7ccbfe36
merged bug fix 28632 barnch: OverlappingIssue
Showing
1 changed file
with
2 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | </div> | 40 | </div> |
| 41 | <div align="center" class="dragger"> | 41 | <div align="center" class="dragger"> |
| 42 | <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true"> | 42 | <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true"> |
| 43 | - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> | 43 | + <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index:9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> |
| 44 | </div> | 44 | </div> |
| 45 | <div class="col-sm-9"> | 45 | <div class="col-sm-9"> |
| 46 | <div style="position: relative; margin-left: 85px;" id="imgdiv"> | 46 | <div style="position: relative; margin-left: 85px;" id="imgdiv"> |
| @@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
| 59 | </div> | 59 | </div> |
| 60 | </div> | 60 | </div> |
| 61 | <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true"> | 61 | <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true"> |
| 62 | - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> | 62 | + <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index: 9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div> |
| 63 | </div> | 63 | </div> |
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |