diff --git a/web/controllers/dashboard.js b/web/controllers/dashboard.js index 758b367..5f35f9e 100644 --- a/web/controllers/dashboard.js +++ b/web/controllers/dashboard.js @@ -33,28 +33,30 @@ $scope.in_file = data.in_file if ($scope.in_file == 1) { - var delayMs = 1500; // delay in milliseconds + var delayMs = 1000; // delay in millisecondsget-more-staff setTimeout(function(){ $('#get-more-newyear').modal('show'); }, delayMs); if ($( window ).width() < 800) { $('#get-more-newyear').on('show.bs.modal', function () { - $('.modal-dialog').css('margin-right',$( window ).width()-$( window ).width()); - $('.modal-dialog').css('margin-left',$( window ).width()-$( window ).width()); - $('.modal-dialog').css('margin-top',$( window ).height()-$( window ).height()); - $('.modal-content').css('height',$( window ).height()*0.95); - $('.modal-content').css('width',$( window ).width()); + $('.my-modal').css('z-index', 1060); + $('.my-modal-dialog').css('margin-right',$( window ).width()-$( window ).width()); + $('.my-modal-dialog').css('margin-left',$( window ).width()-$( window ).width()); + $('.my-modal-dialog').css('margin-top',$( window ).height()-$( window ).height()); + $('.my-modal-content').css('height',$( window ).height()*0.95); + $('.my-modal-content').css('width',$( window ).width()); $('.myCarousel').css('height', $( window ).height()*0.94); $('.myCarousel').css('width', 'auto'); $('.myCarousel').css('object-fit', 'cover'); }); } else { $('#get-more-newyear').on('show.bs.modal', function () { - $('.modal-dialog').css('margin-right',$( window ).width()/4); - $('.modal-dialog').css('margin-left',$( window ).width()/4); - $('.modal-dialog').css('margin-top',$( window ).height()/8); - $('.modal-content').css('height',$( window ).height()*0.7); - $('.modal-content').css('width',$( window ).width()*0.5); + $('.my-modal').css('z-index', 1060); + $('.my-modal-dialog').css('margin-right',$( window ).width()/4); + $('.my-modal-dialog').css('margin-left',$( window ).width()/4); + $('.my-modal-dialog').css('margin-top',$( window ).height()/8); + $('.my-modal-content').css('height',$( window ).height()*0.7); + $('.my-modal-content').css('width',$( window ).width()*0.5); $('.myCarousel').css('height', $( window ).height()*0.7); $('.myCarousel').css('width', 'auto'); $('.myCarousel').css('object-fit', 'cover'); diff --git a/web/views/dashboard/dashboard.html b/web/views/dashboard/dashboard.html index 8c8f155..3bbbef3 100644 --- a/web/views/dashboard/dashboard.html +++ b/web/views/dashboard/dashboard.html @@ -570,7 +570,7 @@
-