Merge remote-tracking branch 'origin/dev' into fix/wysiwyg-changes

Avoid break inside all figures, including images
Left align images in editor
8 changed files with 27 additions and 11 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -84,6 +84,7 @@ services:
    command: "npm run serve"
    volumes:
      - ".:/home/dev/openproject"
+      - "../commonmark-ckeditor-build/build/:/home/dev/openproject/frontend/src/vendor/ckeditor/"
    ports:
      - "4200:4200"
    environment:
--- a/frontend/src/global_styles/content/user-content/_figure.sass
+++ b/frontend/src/global_styles/content/user-content/_figure.sass
@ -7,6 +7,7 @@
  width: 100%
  max-width: 100%
  position: relative
+  break-inside: avoid

  @include styled-scroll-bar

@ -32,14 +33,14 @@
    flex-shrink: 1
    width: 100%
    display: flex
-    justify-content:  center
+    justify-content:  flex-start
+    overflow: auto
+    max-height: 100%
+
  &--description
    flex-basis: auto
    flex-grow: 1
    flex-shrink: 0
    padding: 0.75rem
-    width: 100%
+    max-width: 100%
    text-align: center
-
-  &.table
-    display: flex !important
--- a/frontend/src/global_styles/content/user-content/_image.sass
+++ b/frontend/src/global_styles/content/user-content/_image.sass
@ -1,3 +1,7 @@
 .op-uc-image
  max-width: 100%;
  max-height: 100%;
+
+  // Needed to override built-in ckeditor styles
+  @at-root .op-uc-container .image &
+    margin: 0
--- a/frontend/src/global_styles/content/user-content/_table.sass
+++ b/frontend/src/global_styles/content/user-content/_table.sass
@ -14,8 +14,8 @@

  &--cell
    text-align: left
+    min-width: 3em;
    padding: 0.75rem
-    word-break: break-all

    &:not(:last-child):not([colspan])
      border-right: 1px solid rgba(0, 0, 0, 0.1)
--- a/frontend/src/global_styles/content/user-content/_typography.sass
+++ b/frontend/src/global_styles/content/user-content/_typography.sass
@ -19,6 +19,16 @@
  &:hover .op-uc-link_permalink
    display: inline-flex

+.op-uc-h1,
+.op-uc-h2,
+.op-uc-h3
+  margin-bottom: 0.5rem
+  border-bottom: 1px solid #dadada
+
+  .op-uc-container_reduced-headings
+    border-bottom: none
+    margin-bottom: 0
+
 .op-uc-h1
  font-size: var(--op-uc-heading-base)
 .op-uc-h2
--- a/frontend/src/vendor/ckeditor/ckeditor.js
+++ b/frontend/src/vendor/ckeditor/ckeditor.js
--- a/frontend/src/vendor/ckeditor/ckeditor.js.map
+++ b/frontend/src/vendor/ckeditor/ckeditor.js.map
--- a/spec/features/wysiwyg/custom_css_classes_spec.rb
+++ b/spec/features/wysiwyg/custom_css_classes_spec.rb
@ -112,7 +112,7 @@ describe 'Wysiwyg paragraphs in lists behavior (Regression #28765)',

  it 'custom classes are placed correctly' do
    editor.in_editor do |container, editable|
-      expect(editable).to have_css('p.op-uc-p', count: 5)
+      expect(editable).to have_css('p.op-uc-p', count: 6)
      expect(editable).to have_css('h1.op-uc-h1', count: 1)
      expect(editable).to have_css('h2.op-uc-h2', count: 1)
      expect(editable).to have_css('h3.op-uc-h3', count: 1)
Author	SHA1	Message	Date
ulferts	baeafbd4c6	Merge remote-tracking branch 'origin/dev' into fix/wysiwyg-changes	4 years ago
Benjamin Bädorf	214e3b8371	Avoid break inside all figures, including images	4 years ago
Benjamin Bädorf	2b0b1ca334	Left align images in editor	4 years ago
Benjamin Bädorf	581a601923	Remove word breaking from tables	4 years ago
Benjamin Bädorf	3123ca062d	Add underlines to headings on wiki pages	4 years ago
Benjamin Bädorf	34adc74222	Resize figcaption together with image	4 years ago
Benjamin Bädorf	8959107569	Update CSS Classes spec	4 years ago
Benjamin Bädorf	3b7d98cecc	Revert wrapping table in op-uc-figure--content in edit mdoe	4 years ago
Benjamin Bädorf	6debada632	Left align figure content by default, making the changes in appearance less severe	4 years ago
Benjamin Bädorf	b89dfdbdd8	CKEditor fixes Adds op-uc-figure--content fix for tables, Adds op-uc-container to preview,	4 years ago
Benjamin Bädorf	2bb9461c42	Only set styling on code-block when editing	4 years ago