Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Eibrink-Lunzenauer
Stud.IP
Commits
09c6eaf6
Commit
09c6eaf6
authored
1 year ago
by
Jan-Hendrik Willms
Committed by
David Siegfried
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/visual.inc.php
+1
-1
1 addition, 1 deletion
lib/visual.inc.php
resources/assets/stylesheets/scss/content.scss
+1
-22
1 addition, 22 deletions
resources/assets/stylesheets/scss/content.scss
with
2 additions
and
23 deletions
lib/visual.inc.php
+
1
−
1
View file @
09c6eaf6
...
@@ -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).
...
...
This diff is collapsed.
Click to expand it.
resources/assets/stylesheets/scss/content.scss
+
1
−
22
View file @
09c6eaf6
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment