ADAM / AIAHTML5

Commit 583d94c1864432f8bf9488cdf74626d6fdec996a

Authored by Nikita Kulshreshtha
2 parents 7be6803c a3ef3f63

Merge branch 'lefteditstylepopup' into Develop

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @583d94c
... ... @@ -378,7 +378,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
378 378 // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
379 379  
380 380 //Edit Shape Style popup should open at it's default position
381   - $("#modeleditstyle").css({ "left": "0", "right": "0", "margin": "0 auto", "top":"70px"});
  381 + $("#modeleditstyle").css({ "left": "40%", "right": "0", "top":"70px"});
382 382  
383 383 }
384 384  
... ... @@ -417,7 +417,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
417 417 document.getElementById('modelbackground').style.display = "none";
418 418 document.getElementById('modeleditstyle').style.display = "none";
419 419 //Edit Shape Style popup should open at it's default position
420   - $("#modeleditstyle").css({"left":"0", "right":"0", "margin":"0 auto", "top":"70px"});
  420 + $("#modeleditstyle").css({"left":"40%", "right":"0", "top":"70px"});
421 421  
422 422  
423 423 }
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @583d94c
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <!--<base href="/AIAHTML5/" />-->
  4 + <!--<base href="/AIAHTML5/" />-->
5 5 <!--<base href="/AIA/" />-->
6 6 <base href="/" />
7 7 <meta charset="utf-8">
... ... @@ -735,7 +735,7 @@
735 735 <!--Edit Shape Modal-->
736 736  
737 737  
738   - <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:0;right:0;top:70px;margin: 0 auto;">
  738 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;right:0;top:70px;">
739 739 <div class="modal-content">
740 740 <div class="modal-header annotation-modal-header">
741 741 <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
... ...