Updated codemirror to support panel and match-highlighter and revert some unnecessary changes

3 files changed, 10 insertions, 9 deletions

diff --git a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
index cf92d16d..bbbfa59c 100755
--- a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
+++ b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
@@ -97,7 +97,7 @@
       var height = Math.max(bottom - top, 3);
 
       var elt = frag.appendChild(document.createElement("div"));
-      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth * 2, 2) + "px; top: "
+      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth * 1.5, 2) + "px; top: "
         + (top + this.buttonHeight) + "px; height: " + height + "px";
       elt.className = this.options.className;
     }
diff --git a/public/vendor/codemirror/addon/scroll/simplescrollbars.css b/public/vendor/codemirror/addon/scroll/simplescrollbars.css
index 136be9ac..3b75adc9 100755
--- a/public/vendor/codemirror/addon/scroll/simplescrollbars.css
+++ b/public/vendor/codemirror/addon/scroll/simplescrollbars.css
@@ -15,7 +15,7 @@
 
 .CodeMirror-simplescroll-horizontal {
   bottom: 0; left: 0;
-  height: 8px;
+  height: 6px;
 }
 .CodeMirror-simplescroll-horizontal div {
   bottom: 0;
@@ -24,7 +24,7 @@
 
 .CodeMirror-simplescroll-vertical {
   right: 0; top: 0;
-  width: 8px;
+  width: 6px;
 }
 .CodeMirror-simplescroll-vertical div {
   right: 0;
@@ -39,8 +39,8 @@
 .CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
   position: absolute;
   background: #ccc;
-  border-radius: 3px;
-  margin: 2px;
+  border-radius: 7px;
+  border: 2px solid #222;
 }
 
 .CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
@@ -50,7 +50,7 @@
 
 .CodeMirror-overlayscroll-horizontal {
   bottom: 0; left: 0;
-  height: 6px;
+  height: 10px;
 }
 .CodeMirror-overlayscroll-horizontal div {
   bottom: 0;
@@ -58,8 +58,8 @@
 }
 
 .CodeMirror-overlayscroll-vertical {
-  right: 0; top: 0;
-  width: 6px;
+  right: 0px; top: 0px;
+  width: 10px;
 }
 .CodeMirror-overlayscroll-vertical div {
   right: 0;
diff --git a/public/vendor/codemirror/addon/scroll/simplescrollbars.js b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
index 4f0d0d0f..f78353a1 100755
--- a/public/vendor/codemirror/addon/scroll/simplescrollbars.js
+++ b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
@@ -75,13 +75,14 @@
     this.screen = clientSize;
     this.total = scrollSize;
     this.size = barSize;
+
     var buttonSize = this.screen * (this.size / this.total);
     if (buttonSize < minButtonSize) {
       this.size -= minButtonSize - buttonSize;
       buttonSize = minButtonSize;
     }
     this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
-      (buttonSize - 4) + "px";
+      buttonSize + "px";
     this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
       this.pos * (this.size / this.total) + "px";
   };