ADAM / AIAHTML5

Commit 730793e1f78d5b2bc1e5c46cbab46eeff5ed2fe8

Authored by Amrita Vishnoi
2 parents 443aed6d 86b360b8

Merge branch 'Bug#24827' into Develop-IPAD-MAC

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @730793e
... ... @@ -605,7 +605,7 @@
605 605 </form>
606 606 </div>
607 607 </div>
608   - <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 1234; overflow: auto; width: 100px;">
  608 + <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 15000; overflow: auto; width: 100px;">
609 609 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading">
610 610 </div>
611 611 <!--Annotation Modal-->
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @730793e
... ... @@ -777,7 +777,7 @@ textarea {
777 777 margin-left: -50px; / half width of the spinner gif /
778 778 margin-top: -50px; / half height of the spinner gif /
779 779 text-align: center;
780   - z-index: 1234;
  780 + z-index: 15000;
781 781 overflow: auto;
782 782 width: 100px; / width of the spinner gif /
783 783 height: 102px; /*hight of the spinner gif +2px to fix IE8 issue */
... ...