From 2a21248ec247566adaa5ade3cc439222511f7fcd Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Fri, 2 Mar 2018 15:13:51 -0700
Subject: [PATCH] update uBO code mirror

---
 .../webextension-tweaks/ublock_origin.css     | 60 ++-----------------
 userContent.css                               | 60 ++-----------------
 2 files changed, 12 insertions(+), 108 deletions(-)

diff --git a/userContent-files/webextension-tweaks/ublock_origin.css b/userContent-files/webextension-tweaks/ublock_origin.css
index cd50ebd..7f7d9b7 100644
--- a/userContent-files/webextension-tweaks/ublock_origin.css
+++ b/userContent-files/webextension-tweaks/ublock_origin.css
@@ -4,7 +4,6 @@
   .CodeMirror {
     border: 1px solid!important;
     border-color: var(--tone-5)!important;
-    border-radius: 4px!important;
     background: #2a2a2e!important;
     color: #b1b1b3!important
   }
@@ -35,61 +34,14 @@
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
   }
-  span.cm-comment {
-    color: #dea174!important
+  .cm-staticext {
+    color: var(--theme-highlight-blue)!important
   }
-  span.cm-atom,
-  span.cm-attribute,
-  span.cm-builtin,
-  span.cm-error,
-  span.cm-keyword,
-  span.cm-quote {
-    color: #ff7de9!important
+  .cm-staticnet.cm-block {
+    color: #de7474!important
   }
-  span.cm-number,
-  span.cm-string,
-  span.cm-string-2 {
-    color: #6b89ff!important
-  }
-  span.cm-hr,
-  span.cm-meta {
-    color: #939393!important
-  }
-  span.cm-header,
-  span.cm-qualifier,
-  span.cm-variable-2 {
-    color: #75bfff!important
-  }
-  span.cm-property {
-    color: #86de74!important
-  }
-  span.cm-bracket,
-  span.cm-def,
-  span.cm-link:visited,
-  span.cm-tag {
-    color: #75bfff!important
-  }
-  span.cm-variable {
-    color: #b98eff!important
-  }
-  span.cm-variable-3 {
-    color: #d7d7db!important
-  }
-  span.cm-link {
-    color: #737373!important
-  }
-  span.cm-operator {
-    color: #b1b1b3!important
-  }
-  span.cm-special {
-    color: #d7d7db!important
-  }
-  .CodeMirror-activeline-background {
-    background: rgba(185,215,253,.15)!important
-  }
-  .CodeMirror-matchingbracket {
-    outline: rgba(255,255,255,.25) solid 1px!important;
-    color: #fff!important
+  .cm-staticnet.cm-allow {
+    color: var(--theme-highlight-green)!important
   }
   #appinfo {
     background-color: var(--tone-8)!important;
diff --git a/userContent.css b/userContent.css
index f1b0be0..9043f97 100644
--- a/userContent.css
+++ b/userContent.css
@@ -1487,7 +1487,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .CodeMirror {
     border: 1px solid!important;
     border-color: var(--tone-5)!important;
-    border-radius: 4px!important;
     background: #2a2a2e!important;
     color: #b1b1b3!important
   }
@@ -1518,61 +1517,14 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
   }
-  span.cm-comment {
-    color: #dea174!important
+  .cm-staticext {
+    color: var(--theme-highlight-blue)!important
   }
-  span.cm-atom,
-  span.cm-attribute,
-  span.cm-builtin,
-  span.cm-error,
-  span.cm-keyword,
-  span.cm-quote {
-    color: #ff7de9!important
+  .cm-staticnet.cm-block {
+    color: #de7474!important
   }
-  span.cm-number,
-  span.cm-string,
-  span.cm-string-2 {
-    color: #6b89ff!important
-  }
-  span.cm-hr,
-  span.cm-meta {
-    color: #939393!important
-  }
-  span.cm-header,
-  span.cm-qualifier,
-  span.cm-variable-2 {
-    color: #75bfff!important
-  }
-  span.cm-property {
-    color: #86de74!important
-  }
-  span.cm-bracket,
-  span.cm-def,
-  span.cm-link:visited,
-  span.cm-tag {
-    color: #75bfff!important
-  }
-  span.cm-variable {
-    color: #b98eff!important
-  }
-  span.cm-variable-3 {
-    color: #d7d7db!important
-  }
-  span.cm-link {
-    color: #737373!important
-  }
-  span.cm-operator {
-    color: #b1b1b3!important
-  }
-  span.cm-special {
-    color: #d7d7db!important
-  }
-  .CodeMirror-activeline-background {
-    background: rgba(185,215,253,.15)!important
-  }
-  .CodeMirror-matchingbracket {
-    outline: rgba(255,255,255,.25) solid 1px!important;
-    color: #fff!important
+  .cm-staticnet.cm-allow {
+    color: var(--theme-highlight-green)!important
   }
   #appinfo {
     background-color: var(--tone-8)!important;