Skip to content
Snippets Groups Projects
Commit 09c6eaf6 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

fixes #2772, fixes #2812

Closes #2772 and #2812

Merge request studip/studip!1894
parent c508a4dd
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ require_once 'lib/wiki.inc.php'; ...@@ -9,7 +9,7 @@ require_once 'lib/wiki.inc.php';
// Wrapper for formatted content (defined as a constant since it is used // 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). // 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). //// Functions for processing marked-up text (Stud.IP markup, HTML, JS).
......
...@@ -25,13 +25,8 @@ ...@@ -25,13 +25,8 @@
height: 15px; 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 { .formatted-content {
display: inline; display: flow-root;
a { a {
word-break: break-all; word-break: break-all;
...@@ -54,22 +49,6 @@ ...@@ -54,22 +49,6 @@
pre { // pre-formatted content breaks the Stud.IP Layout! pre { // pre-formatted content breaks the Stud.IP Layout!
white-space: pre-wrap; 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. // Emphasize tt tags a little bit so ##monospace## blocks will stick out.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment