From 09c6eaf6582ad9ea142d0773ff2b5da8d9014fcd Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 6 Sep 2023 06:18:34 +0000
Subject: [PATCH] fixes #2772, fixes #2812
Closes #2772 and #2812
Merge request studip/studip!1894
---
lib/visual.inc.php | 2 +-
.../assets/stylesheets/scss/content.scss | 23 +------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 2b37a64a17b..f01553167e2 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -9,7 +9,7 @@ require_once 'lib/wiki.inc.php';
// Wrapper for formatted content (defined as a constant since it is used
// in the unit test defined in tests/unit/lib/VisualTest.php as well).
-define('FORMATTED_CONTENT_WRAPPER', '<div class="formatted-content">%s</div>');
+define('FORMATTED_CONTENT_WRAPPER', '<div class="formatted-content ck-content">%s</div>');
//// Functions for processing marked-up text (Stud.IP markup, HTML, JS).
diff --git a/resources/assets/stylesheets/scss/content.scss b/resources/assets/stylesheets/scss/content.scss
index 4769434f04d..e04851b5552 100644
--- a/resources/assets/stylesheets/scss/content.scss
+++ b/resources/assets/stylesheets/scss/content.scss
@@ -25,13 +25,8 @@
height: 15px;
}
-// Display formatted content as inline so we don't break any existing code
-// that expects formatReady() to output an inline elements instead of a
-// block element.
-// If browser support for "display: contents" is given, this should be changed
-// to that instead.
.formatted-content {
- display: inline;
+ display: flow-root;
a {
word-break: break-all;
@@ -54,22 +49,6 @@
pre { // pre-formatted content breaks the Stud.IP Layout!
white-space: pre-wrap;
}
-
- figure.table {
- display: table;
- margin: 0.9em auto;
-
- &:not([style]) {
- margin-inline-start: 0;
- }
-
- table {
- td {
- min-width: 2em;
- padding: 0.4em;
- }
- }
- }
}
// Emphasize tt tags a little bit so ##monospace## blocks will stick out.
--
GitLab