From 757bad4fc28a57462e910af5fb3ce09a783b8c33 Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Sun, 11 Mar 2018 13:10:19 -0600
Subject: [PATCH] update uBO CodeMirror

---
 .../webextension-tweaks/ublock_origin.css     | 21 +++++++++++++++++++
 userContent.css                               | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/userContent-files/webextension-tweaks/ublock_origin.css b/userContent-files/webextension-tweaks/ublock_origin.css
index 6ec01e7..c69fa68 100644
--- a/userContent-files/webextension-tweaks/ublock_origin.css
+++ b/userContent-files/webextension-tweaks/ublock_origin.css
@@ -23,6 +23,9 @@
   .CodeMirror-activeline-background {
     background: rgba(185,215,253,.15)!important
   }
+  .CodeMirror-merge-l-chunk {
+    background: var(--tone-7)!important
+  }
   .cm-search-widget {
     background-color: var(--tone-9)!important;
     border: 1px solid;
@@ -43,6 +46,21 @@
   .cm-searching {
     background-color: var(--warning-background-color)!important
   }
+  .cm-staticOpt {
+    background-color: var(--tone-6)!important;
+    font-weight: 700
+  }
+  .CodeMirror-merge-gap {
+    background-color: var(--tone-9)!important;
+    border-top: 1px solid!important;
+    border-bottom: 1px solid!important;
+    border-right: none!important;
+    border-left: none!important;
+    border-color: var(--tone-5)!important
+  }
+  .CodeMirror-merge {
+    border: none!important
+  }
   html body div#userFilters.codeMirrorContainer div div.cm-search-widget span.fa {
     color: var(--tone-6)!important;
     font-size: 100%!important
@@ -94,6 +112,9 @@
     background: var(--tone-7)!important;
     color: var(--tone-4)!important
   }
+  #diff {
+    border-color: var(--tone-5)!important
+  }
   label a,
   p a,
   ul a,
diff --git a/userContent.css b/userContent.css
index 6b2073a..264d9c8 100644
--- a/userContent.css
+++ b/userContent.css
@@ -1543,6 +1543,9 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .CodeMirror-activeline-background {
     background: rgba(185,215,253,.15)!important
   }
+  .CodeMirror-merge-l-chunk {
+    background: var(--tone-7)!important
+  }
   .cm-search-widget {
     background-color: var(--tone-9)!important;
     border: 1px solid;
@@ -1563,6 +1566,21 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .cm-searching {
     background-color: var(--warning-background-color)!important
   }
+  .cm-staticOpt {
+    background-color: var(--tone-6)!important;
+    font-weight: 700
+  }
+  .CodeMirror-merge-gap {
+    background-color: var(--tone-9)!important;
+    border-top: 1px solid!important;
+    border-bottom: 1px solid!important;
+    border-right: none!important;
+    border-left: none!important;
+    border-color: var(--tone-5)!important
+  }
+  .CodeMirror-merge {
+    border: none!important
+  }
   html body div#userFilters.codeMirrorContainer div div.cm-search-widget span.fa {
     color: var(--tone-6)!important;
     font-size: 100%!important
@@ -1614,6 +1632,9 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background: var(--tone-7)!important;
     color: var(--tone-4)!important
   }
+  #diff {
+    border-color: var(--tone-5)!important
+  }
   label a,
   p a,
   ul a,