From c7b8978c38abbe34aef7d8dba3d850fc73df1a34 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 Mar 2023 16:57:10 +0000
Subject: [PATCH] replace margin with padding, re #2312, re #2390
Merge request studip/studip!1610
---
resources/assets/stylesheets/scss/contents.scss | 2 --
resources/assets/stylesheets/scss/layouts.scss | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/resources/assets/stylesheets/scss/contents.scss b/resources/assets/stylesheets/scss/contents.scss
index be96c99e505..4e9d8f451da 100644
--- a/resources/assets/stylesheets/scss/contents.scss
+++ b/resources/assets/stylesheets/scss/contents.scss
@@ -11,7 +11,6 @@
height: 100px;
.content-item-link {
- height: 90px;
padding: 5px;
grid-template-columns: 42px 135px;
@@ -54,7 +53,6 @@
display: grid;
grid-template-columns: 74px auto;
grid-gap: 5px;
- height: 130px;
padding: 15px 10px 0 10px;
transition: 0.5s;
diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss
index 65f76134bac..fd647b12e86 100644
--- a/resources/assets/stylesheets/scss/layouts.scss
+++ b/resources/assets/stylesheets/scss/layouts.scss
@@ -167,9 +167,9 @@ body {
grid-column: 2 / 3;
grid-row: 2 / 3;
justify-content: flex-start;
- margin: $page-margin;
- margin-bottom: calc($page-margin + 35px);
overflow-x: auto;
+ padding: $page-margin;
+ padding-bottom: calc($page-margin + 35px);
vertical-align: top;
.oversized & {
--
GitLab