From f0988b93bda4a233f7966b55f4aa7b4bedfcda1f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 16 Oct 2022 19:19:03 +0200 Subject: [PATCH] fix fixed menu view --- templates/css/stylesheet.php | 11 ++++ templates/js/_alwaysDisplayed.js | 86 -------------------------------- 2 files changed, 11 insertions(+), 86 deletions(-) delete mode 100644 templates/js/_alwaysDisplayed.js diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php index dd633d9..7f92613 100644 --- a/templates/css/stylesheet.php +++ b/templates/css/stylesheet.php @@ -114,3 +114,14 @@ font-size: 16px; } + + + #content { + left: 60px; + width: calc(100% - (var(--body-container-margin) * 2) - 70px) + } + + #content-vue { + width: calc(100% - (var(--body-container-margin) * 2) - 60px) + } + diff --git a/templates/js/_alwaysDisplayed.js b/templates/js/_alwaysDisplayed.js deleted file mode 100644 index 9e3727f..0000000 --- a/templates/js/_alwaysDisplayed.js +++ /dev/null @@ -1,86 +0,0 @@ -const alwaysDisplayed = function() { - const elements = querySelectorAll('*') - const fixedElements = [] - - for (let element of elements) { - if (typeof element !== 'object') { - continue - } - - const position = window.getComputedStyle(element, null).getPropertyValue('position') - - if (position !== 'fixed') { - continue - } - - const id = element.getAttribute('id') - - if (id === 'header' || id === 'side-menu' || id === 'side-menu-loader') { - continue - } - - if (element.classList.contains('oc-dialog')) { - continue - } - - let elementIsInSideMenu = false - let parent = element.parentNode - - while (parent && !elementIsInSideMenu) { - try { - if (parent.getAttribute('id') === 'side-menu') { - elementIsInSideMenu = true - } - } catch (e) { - } - - parent = parent.parentNode - } - - if (elementIsInSideMenu) { - continue - } - - fixedElements.push(element) - } - - for (let i in fixedElements) { - const element = fixedElements[i] - const computedStyle = window.getComputedStyle(element, null) - const left = computedStyle.getPropertyValue('left') - const right = computedStyle.getPropertyValue('right') - - if (right !== '0px') { - const intValue = parseInt(left.replace('px', '')) + 50 - element.style.setProperty('transform', 'translateX(' + intValue.toString() + 'px)') - } - } -} - -const content = querySelector('#content') - -if (content && content.classList.contains('app-settings')) { - let loaded = false - const config = { - attributes: false, - childList: true, - subtree: true - } - const observer = new MutationObserver(() => { - if (loaded) { - return - } - - const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul') - - if (element) { - loaded = true - - alwaysDisplayed() - } - }) - - observer.observe(content, config) -} else { - window.setTimeout(alwaysDisplayed, 200) -}