Commit 3727f67703218e6d6e25590effdf6f7f5a90d970
1 parent
6bcd834e
Caret Z-index issue
Showing
2 changed files
with
5 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -274,9 +274,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -274,9 +274,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
274 | $scope.imageWidth = this.width; | 274 | $scope.imageWidth = this.width; |
275 | $scope.imageHeight = this.height; | 275 | $scope.imageHeight = this.height; |
276 | 276 | ||
277 | - $('#aaBodyView').css("height", $(window).outerHeight()); | ||
278 | - | ||
279 | - $('#aaBodyView').css("width", $(window).outerWidth()); | 277 | + |
280 | $timeout(function () { | 278 | $timeout(function () { |
281 | $compile(aaViewElement.contents())($scope); | 279 | $compile(aaViewElement.contents())($scope); |
282 | 280 | ||
@@ -285,7 +283,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -285,7 +283,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
285 | 283 | ||
286 | //0.4 added some stylesheets | 284 | //0.4 added some stylesheets |
287 | 285 | ||
288 | - | 286 | + $('#aaBodyView').css("height", $(window).outerHeight()); |
287 | + | ||
288 | + $('#aaBodyView').css("width", $(window).outerWidth()); | ||
289 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); | 289 | $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); |
290 | 290 | ||
291 | $('.canvasDivClass').css("height", $rootScope.canvasDivHeight); | 291 | $('.canvasDivClass').css("height", $rootScope.canvasDivHeight); |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -517,7 +517,7 @@ pointer-events: auto; | @@ -517,7 +517,7 @@ pointer-events: auto; | ||
517 | position: absolute; | 517 | position: absolute; |
518 | top: 110px; | 518 | top: 110px; |
519 | left: 100px; | 519 | left: 100px; |
520 | - z-index: 99999; | 520 | + z-index: 9; |
521 | -moz-transition: left 0.5s ease; | 521 | -moz-transition: left 0.5s ease; |
522 | transition: left 0.5s ease; | 522 | transition: left 0.5s ease; |
523 | background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0; | 523 | background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0; |