diff --git a/arsnova.click/client/layout/global/styles/mainLayout.scss b/arsnova.click/client/layout/global/styles/mainLayout.scss index f936960e4b7a72f5978812b96001142096b88a05..75e55c4eeb1eee1b0eac578994fa175f49e6cec2 100644 --- a/arsnova.click/client/layout/global/styles/mainLayout.scss +++ b/arsnova.click/client/layout/global/styles/mainLayout.scss @@ -30,7 +30,7 @@ width: 100%; height: 100%; overflow-x: auto; - z-index: 1050; + z-index: 1040; } .contentPosition > .row { diff --git a/arsnova.click/client/layout/region_footer/scripts/lib.js b/arsnova.click/client/layout/region_footer/scripts/lib.js index b4e907c4f0be767dfa6ca8d0ff14d5b7b09949b8..043eb4ef1162d1285343422adcf66a4f8f6ef088 100644 --- a/arsnova.click/client/layout/region_footer/scripts/lib.js +++ b/arsnova.click/client/layout/region_footer/scripts/lib.js @@ -164,15 +164,10 @@ export const updateStatefulFooterElements = Tracker.autorun(function () { }); export function calculateFooterFontSize() { - let iconSize = "3vh", textSize = "2vh"; + let iconSize = "2rem", textSize = "1.5rem"; const navbarFooter = $(".navbar-footer"); const fixedBottom = $('.fixed-bottom'); - - if ($(document).width() > $(document).height()) { - iconSize = "2vw"; - textSize = "1vw"; - } - $(".footerElementText").css("fontSize", textSize); + $(".footerElemText").css("fontSize", textSize); navbarFooter.css({"fontSize": iconSize}); fixedBottom.css("bottom", navbarFooter.height()); fixedBottom.show(); diff --git a/arsnova.click/client/layout/region_header/lib.js b/arsnova.click/client/layout/region_header/lib.js index e9310436a8c88ca2e2fa2907cfc872ddce883a7d..0d74d2ab088f4a9ec0930214d767b04ed0e5997e 100644 --- a/arsnova.click/client/layout/region_header/lib.js +++ b/arsnova.click/client/layout/region_header/lib.js @@ -45,9 +45,9 @@ export function addNewQuestion() { export function calculateTitelHeight() { var fixedTop = $(".navbar-fixed-top"); var container = $(".container"); - var footerHeight = $(".fixed-bottom").outerHeight(true) + $(".footer-info-bar").outerHeight(); - //var navbarFooterHeight = $('.navbar-fixed-bottom').is(":visible") ? $(".navbar-fixed-bottom").outerHeight() : 0; - var finalHeight = $(window).height() - fixedTop.outerHeight() - footerHeight; + //var footerHeight = $(".fixed-bottom").outerHeight(true) + $(".footer-info-bar").outerHeight(); + var navbarFooterHeight = $('.navbar-fixed-bottom').is(":visible") ? $(".navbar-fixed-bottom").outerHeight() : 0; + var finalHeight = $(window).height() - fixedTop.outerHeight() - navbarFooterHeight; container.css("height", finalHeight); container.css("margin-top", fixedTop.outerHeight()); diff --git a/arsnova.click/client/layout/region_header/titel.js b/arsnova.click/client/layout/region_header/titel.js index 08ebb5c457e1ef3646ad124a2c8c0fab19de6b9a..edd9ba79590f937bbbfe5b2180da33668e0bb5de 100644 --- a/arsnova.click/client/layout/region_header/titel.js +++ b/arsnova.click/client/layout/region_header/titel.js @@ -22,10 +22,10 @@ import * as lib from './lib.js'; let titelHeightTracker = null; Template.titel.onRendered(function () { + $(window).resize(function () { + lib.calculateTitelHeight(); + }); titelHeightTracker = Tracker.autorun(function () { - $(window).resize(function () { - lib.calculateTitelHeight(); - }); lib.calculateTitelHeight(); }); });