aboutsummaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2023-03-21 16:57:10 +0000
committerElmar Ludwig <elmar.ludwig@uni-osnabrueck.de>2023-03-21 16:57:10 +0000
commitfed123dde6f935e966e259f8438c18acd86b7b76 (patch)
tree80b037457802a80af890660a8ce7fcbd1248aae1 /resources
parentad6d485eee53dc85a00d2617e3655cf72166e38f (diff)
replace margin with padding, re #2312, re #2390
Merge request studip/studip!1610
Diffstat (limited to 'resources')
-rw-r--r--resources/assets/stylesheets/scss/contents.scss2
-rw-r--r--resources/assets/stylesheets/scss/layouts.scss4
2 files changed, 2 insertions, 4 deletions
diff --git a/resources/assets/stylesheets/scss/contents.scss b/resources/assets/stylesheets/scss/contents.scss
index be96c99..4e9d8f4 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 58f7ff4..ab15cec 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 & {