diff --git a/openslides/projector/static/styles/projector-control.css b/openslides/projector/static/styles/projector-control.css index eaa258c6f..984a738fc 100644 --- a/openslides/projector/static/styles/projector-control.css +++ b/openslides/projector/static/styles/projector-control.css @@ -37,25 +37,32 @@ /* iframe */ #iframe { - -moz-transform: scale(0.25, 0.25) translate(-150%, -150%); - -webkit-transform: scale(0.25, 0.25) translate(-150%, -150%); - -o-transform: scale(0.25, 0.25) translate(-150%, -150%); - transform: scale(0.25, 0.25) translate(-150%, -150%); - width: 400%; - height: 400%; + -ms-zoom: 0.25; + -moz-transform-origin: 0 0; + -webkit-transform-origin: 0 0; + -o-transform-origin: 0 0; + -moz-transform: scale(0.25); + -webkit-transform: scale(0.25); + -o-transform: scale(0.25); + + width: 1024px; + height: 768px; } + #iframewrapper { width: 256px;/*100%;*/ height: 192px;/*230px;*/ + position: relative; + overflow: hidden; } #iframeoverlay { width: 256px; height: 192px; - position: fixed; + position: absolute; top: 0px; left: 0px; - display: none; + display: block; z-index: 1; } /* countdown */ diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index 1dcecb5f3..3e74ceb1a 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -26,21 +26,6 @@ $( this ).parents( ".portlet:first" ).find( ".portlet-content" ).toggle(); }); $( ".column" ).disableSelection(); - - var overlay_placement = function(){ - var if_top = $("#iframe").offset().top; - var if_left = $("#iframe").offset().left; - - // the overlay uses absolute positioning, - // place it over the iframe - $("#iframeoverlay").css({'display' : 'block', - 'top' : if_top, - 'left' : if_left - }); - }; - - $("document").ready(overlay_placement); - $(window).resize(overlay_placement); }); @@ -100,7 +85,7 @@
- +