fix: restore auto-paragraph #412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wesleyboar
commented
Jan 18, 2024
Comment on lines
+211
to
+213
| 'stylesSet': 'default:/static/js/addons/ckeditor.wysiwyg.js', | ||
| 'contentsCss': ['/static/djangocms_text_ckeditor/ckeditor/contents.css'], | ||
| } |
There was a problem hiding this comment.
Explanation. I must duplicate these two settings from Core-CMS, because settings are not smart enough to merge lists.
| @@ -205,6 +205,12 @@ | |||
| # https://github.com/django-cms/django-filer/blob/2.0.2/docs/permissions.rst | |||
| FILER_ENABLE_PERMISSIONS = True | |||
|
|
|||
| # https://github.com/django-cms/djangocms-text-ckeditor | |||
| CKEDITOR_SETTINGS = { | |||
| 'autoParagraph': True, # Core-CMS had set this to False | |||
There was a problem hiding this comment.
Important. This is what is changing. Paragraphs will automatically wrap inline elements upon editing a Text plugin instance.
R-Tomas-Gonzalez
approved these changes
Jan 30, 2024
|
@R-Tomas-Gonzalez and I double-tested on local and dev. A good page to test was https://dev.tup.tacc.utexas.edu/use-tacc/getting-started/. |
wesleyboar
added a commit
that referenced
this pull request
Feb 16, 2024
#412 Side Effect: - A `<p>` is added around any Text within a `c-feed-list`. This commit: - Add support for time wrapped in `<p>`. - Retain support for time NOT wrapped in `<p>`.
wesleyboar
added a commit
that referenced
this pull request
Feb 19, 2024
* hotfix: c-feed-list must support `<p><time/></p>` #412 Side Effect: - A `<p>` is added around any Text within a `c-feed-list`. This commit: - Add support for time wrapped in `<p>`. - Retain support for time NOT wrapped in `<p>`. * hotfix: cleanup and fix c-feed-list further * hotfix: no margin bottom on c-feed-list time & a * hotfix: no margin bottom on c-feed-list time & a … for real * hotfix: remove unnecessary CSS selector
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Allow WYSIWYG to force
<p>tags.Related
TUP-566
undo feat(settings): wysiwyg should not force <p> tags Core-CMS#574
depends on several Core-Styles PRs
Changes
Testing
Auto-Paragraph Feature
<p>, no<h1>):<h1>,<p>).<p>tag.Auto-Paragraph Side-Effects
<a href="…" class="c-button c-button--primary">…</a><a href="…"><i class="icon icon-push-right">></i> …</a><p>tag.UI
Auto-Paragraph Feature
Before.mov
Auto-Paragraph Side-Effects
<p>)<p>)a.c-buttona > i