Fix: Detaching node element surrounded by text elements now merges these text element...

[fnpeditor.git] / modules / diffViewer / diffViewer.less

diff --git a/modules/diffViewer/diffViewer.less b/modules/diffViewer/diffViewer.less
index 1ab9c32..34ab240 100644 (file)
--- a/modules/diffViewer/diffViewer.less
+++ b/modules/diffViewer/diffViewer.less
@@ -1,77 +1,77 @@
-.rng-module-diffViewer {\r
-    .nav-tabs > li > a {\r
-        min-width: 0;\r
-        font-size: 0.9em;\r
-        padding: 4px 6px;\r
-    }\r
-    \r
-    .tab-content {\r
-        position: absolute;\r
-        top:0;\r
-        bottom:0;\r
-        left:0;\r
-        right:60px;\r
-        overflow-y: scroll;\r
-        &::-webkit-scrollbar {\r
-            .rng-mixin-scrollbar;\r
-        }\r
-        &::-webkit-scrollbar-track {\r
-            .rng-mixin-scrollbar-track;\r
-        }\r
-        &::-webkit-scrollbar-thumb {\r
-            .rng-mixin-scrollbar-thumb;\r
-        }\r
-        &::-webkit-scrollbar-thumb:window-inactive {\r
-            .rng-mixin-scrollbar-thumb-window-inactive;\r
-        }\r
-    }\r
-    \r
-    .diff_table {\r
-        border-width: 1px 0 1px 1px;\r
-        border-style: solid;\r
-        border-color: #ddd;\r
-        empty-cells: show;\r
-        border-spacing: 0px;\r
-    }\r
-\r
-    .diff_table td {\r
-        border-width: 0px 1px 1px 0px;\r
-        border-style: dotted;\r
-        border-color: grey;\r
-        font-size: 10px;\r
-        line-height: 20px;\r
-        font-family: monospace;\r
-        padding: 0px;\r
-        white-space: pre-line;\r
-        /*word-wrap:break-word;\r
-         word-break:break-all; */\r
-    }\r
-\r
-    .diff_table th {\r
-        border-width: 0px 1px 1px 0px;\r
-        border-style: solid;\r
-        border-color: #ddd;\r
-        background: #e5ffe5;\r
-    }\r
-\r
-    .diff_table tr.change {\r
-        background-color: #dcdcdc;\r
-    }\r
-\r
-    .diff_mark {\r
-        display: inline-block;\r
-        padding: 2px;\r
-    }\r
-\r
-    .diff_mark_removed {\r
-        background-color: #ff9c94;\r
-    }\r
-\r
-    .diff_mark_added {\r
-        background-color: #90ee90;\r
-    }\r
-\r
-    .diff_mark_changed {\r
-        background-color: yellow;\r
-    }\r
+.rng-module-diffViewer {
+    .nav-tabs > li > a {
+        min-width: 0;
+        font-size: 0.9em;
+        padding: 4px 6px;
+    }
+    
+    .tab-content {
+        position: absolute;
+        top:0;
+        bottom:0;
+        left:0;
+        right:60px;
+        overflow-y: scroll;
+        &::-webkit-scrollbar {
+            .rng-mixin-scrollbar;
+        }
+        &::-webkit-scrollbar-track {
+            .rng-mixin-scrollbar-track;
+        }
+        &::-webkit-scrollbar-thumb {
+            .rng-mixin-scrollbar-thumb;
+        }
+        &::-webkit-scrollbar-thumb:window-inactive {
+            .rng-mixin-scrollbar-thumb-window-inactive;
+        }
+    }
+    
+    .diff_table {
+        border-width: 1px 0 1px 1px;
+        border-style: solid;
+        border-color: #ddd;
+        empty-cells: show;
+        border-spacing: 0px;
+    }
+
+    .diff_table td {
+        border-width: 0px 1px 1px 0px;
+        border-style: dotted;
+        border-color: grey;
+        font-size: 10px;
+        line-height: 20px;
+        font-family: monospace;
+        padding: 0px;
+        white-space: pre-line;
+        /*word-wrap:break-word;
+         word-break:break-all; */
+    }
+
+    .diff_table th {
+        border-width: 0px 1px 1px 0px;
+        border-style: solid;
+        border-color: #ddd;
+        background: #e5ffe5;
+    }
+
+    .diff_table tr.change {
+        background-color: #dcdcdc;
+    }
+
+    .diff_mark {
+        display: inline-block;
+        padding: 2px;
+    }
+
+    .diff_mark_removed {
+        background-color: #ff9c94;
+    }
+
+    .diff_mark_added {
+        background-color: #90ee90;
+    }
+
+    .diff_mark_changed {
+        background-color: yellow;
+    }
 }
\ No newline at end of file