From 5452656a09def98a20d264bf79a2cbf1298f1d22 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 11 Apr 2024 18:19:25 +0000
Subject: [PATCH] resurrect missing list classes, fixes #3997
Closes #3997
Merge request studip/studip!2848
---
resources/assets/stylesheets/mixins/misc.scss | 4 ----
.../assets/stylesheets/mixins/studip.scss | 16 --------------
.../assets/stylesheets/scss/dashboard.scss | 2 +-
resources/assets/stylesheets/scss/lists.scss | 21 ++++++++++++++++---
.../assets/stylesheets/scss/profile.scss | 2 +-
5 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/resources/assets/stylesheets/mixins/misc.scss b/resources/assets/stylesheets/mixins/misc.scss
index 90d61c5ec99..1fe9d0883aa 100644
--- a/resources/assets/stylesheets/mixins/misc.scss
+++ b/resources/assets/stylesheets/mixins/misc.scss
@@ -15,10 +15,6 @@
clear: both;
}
}
-@mixin list-unstyled {
- padding-left: 0;
- list-style: none;
-}
@mixin size($height, $width) {
diff --git a/resources/assets/stylesheets/mixins/studip.scss b/resources/assets/stylesheets/mixins/studip.scss
index 344f8027114..1bbd7d55eea 100644
--- a/resources/assets/stylesheets/mixins/studip.scss
+++ b/resources/assets/stylesheets/mixins/studip.scss
@@ -259,19 +259,3 @@
/* Opera doesn't support this in the shorthand */
background-attachment: local, local, scroll, scroll;
}
-
-@mixin list-unstyled {
- padding-left: 0;
- list-style: none;
-}
-
-@mixin list-inline {
- @include list-unstyled();
- margin-left: -5px;
-
- > li {
- display: inline-block;
- padding-left: 5px;
- padding-right: 5px;
- }
-}
diff --git a/resources/assets/stylesheets/scss/dashboard.scss b/resources/assets/stylesheets/scss/dashboard.scss
index 6020d6e3c0f..e353f72a0e4 100644
--- a/resources/assets/stylesheets/scss/dashboard.scss
+++ b/resources/assets/stylesheets/scss/dashboard.scss
@@ -77,7 +77,7 @@
padding-bottom: 1em;
ul {
- @include list-inline();
+ @extend .list-inline;
img {
margin-left: 0.25em;
diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss
index a2609583d00..6de20041502 100644
--- a/resources/assets/stylesheets/scss/lists.scss
+++ b/resources/assets/stylesheets/scss/lists.scss
@@ -10,9 +10,25 @@ ol {
}
}
+.list-unstyled {
+ padding-left: 0;
+ list-style: none;
+}
+
+.list-inline {
+ @extend .list-unstyled;
+ margin-left: -5px;
+
+ > li {
+ display: inline-block;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+}
+
//comma separated
.list-csv {
- @include list-inline();
+ @extend .list-inline;
margin-left: 0;
> li {
@@ -24,7 +40,6 @@ ol {
&:last-child {
padding-right: 0;
-
&::after {
content: unset;
}
@@ -39,7 +54,7 @@ ol {
}
.list-pipe-separated {
- @include list-inline();
+ @extend .list-inline;
display: flex; // Prevents the mystery gap between elements
> li {
diff --git a/resources/assets/stylesheets/scss/profile.scss b/resources/assets/stylesheets/scss/profile.scss
index ef7e75adbf4..c180e0398fe 100644
--- a/resources/assets/stylesheets/scss/profile.scss
+++ b/resources/assets/stylesheets/scss/profile.scss
@@ -13,7 +13,7 @@
padding: 0 1em;
}
.profile-view-actions {
- @include list-unstyled();
+ @extend .list-unstyled;
img {
vertical-align: text-top;
}
--
GitLab