fix: \r shouldn't be visualized like a newline in Combined renderer

#34 Signed-off-by: Jack Cherng <jfcherng@gmail.com>
jfcherng · Aug 10, 2020 · 35a2502 · 35a2502
1 parent cb2bed2
commit 35a2502
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/example/diff-table.css b/example/diff-table.css
@@ -75,6 +75,9 @@
 .diff-wrapper.diff.diff-html {
   white-space: pre-wrap;
 }
+.diff-wrapper.diff.diff-html.diff-combined .change.change-rep .rep {
+  white-space: normal;
+}
 .diff-wrapper.diff.diff-html .change.change-eq .old,
 .diff-wrapper.diff.diff-html .change.change-eq .new {
   background: #fff;
@@ -88,7 +91,9 @@
 .diff-wrapper.diff.diff-html .change .rep {
   background: #fef6d9;
 }
-.diff-wrapper.diff.diff-html .change .old.none, .diff-wrapper.diff.diff-html .change .new.none, .diff-wrapper.diff.diff-html .change .rep.none {
+.diff-wrapper.diff.diff-html .change .old.none,
+.diff-wrapper.diff.diff-html .change .new.none,
+.diff-wrapper.diff.diff-html .change .rep.none {
   background: transparent;
   cursor: not-allowed;
 }

diff --git a/example/diff-table.scss b/example/diff-table.scss
@@ -123,6 +123,15 @@ $diff-bg-color-none-block-alternative: mix($diff-bg-color, $diff-table-sidebar-c
   &.diff-html {
     white-space: pre-wrap;
 
+    &.diff-combined {
+      .change.change-rep {
+        .rep {
+          // fixes https://github.com/jfcherng/php-diff/issues/34#issuecomment-671404456
+          white-space: normal;
+        }
+      }
+    }
+
     .change {
       &.change-eq {
         .old,