Draw side-by-side view only one table.

1 files changed, 44 insertions, 11 deletions

diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index a0309113054..965348b3b88 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -19,6 +19,50 @@ $unselected_line:         #f8f8f8;
     min-height: 19px;
   }
 
+
+  .header.line_content, .diff-line-num {
+    &.origin {
+      background-color: $origin_gutter;
+      &.selected {
+        background-color: $selected_origin_gutter;
+      }
+      &.unselected {
+        background-color: $unselected_gutter;
+      }
+    }
+    &.head {
+      background-color: $head_gutter;
+      &.selected {
+        background-color: $selected_head_gutter;
+      }
+      &.unselected {
+        background-color: $unselected_gutter;
+      }
+    }
+  }
+
+  .line_content {
+    &.origin {
+      background-color: $origin_line;
+      &.selected {
+        background-color: $selected_origin_line;
+      }
+      &.unselected {
+        background-color: $unselected_line;
+      }
+    }
+    &.head {
+      background-color: $head_line;
+      &.selected {
+        background-color: $selected_head_line;
+      }
+      &.unselected {
+        background-color: $unselected_line;
+      }
+    }
+  }
+
+
   .head {
     .header, .diff-line-num {
       background-color: $head_gutter;
@@ -71,17 +115,6 @@ $unselected_line:         #f8f8f8;
     }
   }
 
-  .parallel-view {
-    .diff-content {
-      overflow: hidden;
-
-      table {
-        width: 50%;
-        float: left;
-      }
-    }
-  }
-
   .parallel .header {
     button {
       right: 10px;