From 2c0d5f16b9ffc292dfda20651c7ad7f056e19899 Mon Sep 17 00:00:00 2001
From: Ash Wilson <smashwilson@gmail.com>
Date: Tue, 23 Feb 2016 17:07:23 -0600
Subject: [PATCH] Use block decorations

---
 lib/view/covering-view.coffee | 8 ++------
 styles/merge-conflicts.less   | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/view/covering-view.coffee b/lib/view/covering-view.coffee
index 1384170..e65753a 100644
--- a/lib/view/covering-view.coffee
+++ b/lib/view/covering-view.coffee
@@ -8,17 +8,13 @@ class CoveringView extends View
   initialize: (@editor) ->
     @coverSubs = new CompositeDisposable
     @overlay = @editor.decorateMarker @cover(),
-      type: 'overlay',
+      type: 'block',
       item: this,
-      position: 'tail'
+      position: 'before'
 
     @coverSubs.add @editor.onDidDestroy => @cleanup()
 
   attached: ->
-    view = atom.views.getView(@editor)
-    @parent().css right: view.getVerticalScrollbarWidth()
-
-    @css 'margin-top': -@editor.getLineHeightInPixels()
     @height @editor.getLineHeightInPixels()
 
   cleanup: ->
diff --git a/styles/merge-conflicts.less b/styles/merge-conflicts.less
index 6e32cae..04e91f7 100644
--- a/styles/merge-conflicts.less
+++ b/styles/merge-conflicts.less
@@ -53,13 +53,9 @@
   .stage .text-success { display: none; }
 }
 
-// This targetting is temporary until SideViews work as overlay decorations.
-// See https://github.com/smashwilson/merge-conflicts/pull/93 for progress.
-atom-overlay {
+atom-text-editor.conflicted {
   .side {
     padding: 0 20px;
-    left: 0;
-    right: 0;
 
     span {
       margin-left: 10px;