From 7302021aebec696ef678b24909ed0c5136b715c0 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Thu, 4 Aug 2022 12:59:25 +0000
Subject: [PATCH] Biest #1375
Closes #1375
Merge request studip/studip!860
---
.../assets/stylesheets/scss/blockquote.scss | 21 +++++++++++++++++++
.../assets/stylesheets/scss/blubber.scss | 3 ---
resources/assets/stylesheets/studip.less | 19 -----------------
resources/assets/stylesheets/studip.scss | 1 +
4 files changed, 22 insertions(+), 22 deletions(-)
create mode 100644 resources/assets/stylesheets/scss/blockquote.scss
diff --git a/resources/assets/stylesheets/scss/blockquote.scss b/resources/assets/stylesheets/scss/blockquote.scss
new file mode 100644
index 00000000000..40643ba5c80
--- /dev/null
+++ b/resources/assets/stylesheets/scss/blockquote.scss
@@ -0,0 +1,21 @@
+blockquote {
+ background-color: $dark-gray-color-5;
+ border-left: 3px solid $base-color;
+ padding: 4px 10px;
+ margin: 0 0 8px;
+ color: black;
+ > .author {
+ margin-bottom: 4px;
+ color: black;
+ font-weight: 600;
+ }
+ blockquote {
+ background-color: white;
+ blockquote {
+ background-color: $dark-gray-color-5;
+ blockquote {
+ background-color: white;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/stylesheets/scss/blubber.scss b/resources/assets/stylesheets/scss/blubber.scss
index 49eee3cb865..c9040ea2fbd 100644
--- a/resources/assets/stylesheets/scss/blubber.scss
+++ b/resources/assets/stylesheets/scss/blubber.scss
@@ -207,9 +207,6 @@
> .name {
display: none;
}
- blockquote {
- background-color: rgba(255, 255, 255, 0.1);
- }
}
> .avatar {
display: none;
diff --git a/resources/assets/stylesheets/studip.less b/resources/assets/stylesheets/studip.less
index 07550d49205..3fa0b8d055b 100644
--- a/resources/assets/stylesheets/studip.less
+++ b/resources/assets/stylesheets/studip.less
@@ -108,25 +108,6 @@ ul + br, table + br {
display: none;
}
-blockquote {
- border-left: 3px solid @brand-color-lighter;
- padding: 5px;
- margin: 8px;
- padding-left: 8px;
- margin-left: 0px;
- background-color: rgba(0,0,0,0.05);
- > .author {
- background-color: @brand-color-lighter;
- padding: 4px;
- margin-left: -10px;
- padding-left: 15px;
- margin-right: -5px;
- color: white;
- margin-top: -5px;
- margin-bottom: 5px;
- }
-}
-
dd { margin-left: 1.5em; }
input.placeholder { opacity: 0.7; }
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 62bc7b59ca9..931c4d0b264 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -12,6 +12,7 @@
@import "scss/admin-courses";
@import "scss/admission";
@import "scss/avatar";
+@import "scss/blockquote";
@import "scss/blubber";
@import "scss/contentbar";
@import "scss/contents";
--
GitLab