From fd2bac153dc4da4b13dde74578fffac20d3c8b59 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Fri, 8 Jul 2022 13:01:44 +0000
Subject: [PATCH] don't set `overflow: auto` on HTML element, fixes #1293
Closes #1293 and #1294
Merge request studip/studip!789
---
resources/assets/stylesheets/less/header.less | 7 +++++--
resources/assets/stylesheets/scss/wiki.scss | 3 ---
resources/assets/stylesheets/studip.scss | 6 ------
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/resources/assets/stylesheets/less/header.less b/resources/assets/stylesheets/less/header.less
index d200787692b..feec0dc1f63 100644
--- a/resources/assets/stylesheets/less/header.less
+++ b/resources/assets/stylesheets/less/header.less
@@ -9,9 +9,7 @@
color: @contrast-content-white;
border-bottom-style: solid;
height: @bar-bottom-container-height;
-
width: 100%;
- position: relative;
display: flex;
flex-direction: row;
@@ -31,6 +29,11 @@
z-index: 2;
}
+// Fix header covering relevant other areas
+// @see https://gitlab.studip.de/studip/studip/-/issues/1019
+html {
+ scroll-padding-top: calc(@bar-bottom-container-height + 1em);
+}
#layout_footer,
#barBottomright {
diff --git a/resources/assets/stylesheets/scss/wiki.scss b/resources/assets/stylesheets/scss/wiki.scss
index df75274d106..201d6af0e89 100644
--- a/resources/assets/stylesheets/scss/wiki.scss
+++ b/resources/assets/stylesheets/scss/wiki.scss
@@ -39,9 +39,6 @@ textarea.wiki-editor {
}
body#wiki #main_content {
- a:not([href]) {
- scroll-margin-top: ceil($bar-bottom-container-height + 10);
- }
td.printcontent:last-child:not(:first-child) {
padding-right: 22px;
}
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 3241caa7d54..7739b2ebf36 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -47,9 +47,3 @@
width: 1px;
}
-// Fix header covering relevant other areas
-// @see https://gitlab.studip.de/studip/studip/-/issues/1019
-html {
- overflow: auto;
- scroll-padding-top: calc(#{$bar-bottom-container-height} + 1em);
-}
--
GitLab