summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/addon/scroll
diff options
context:
space:
mode:
authorWu Cheng-Han2015-05-15 12:58:13 +0800
committerWu Cheng-Han2015-05-15 12:58:13 +0800
commit4e64583a0b6175d2c9a6729ffde1472dd55d389c (patch)
tree75253f2425f2e4f5906ed4fd30eca29a906ee47a /public/vendor/codemirror/addon/scroll
parent2d36d7ce84c636faac17cef3d3a7c22568df38fe (diff)
Marked as 0.2.8
Diffstat (limited to 'public/vendor/codemirror/addon/scroll')
-rwxr-xr-xpublic/vendor/codemirror/addon/scroll/annotatescrollbar.js2
-rwxr-xr-xpublic/vendor/codemirror/addon/scroll/simplescrollbars.css3
-rwxr-xr-xpublic/vendor/codemirror/addon/scroll/simplescrollbars.js3
3 files changed, 4 insertions, 4 deletions
diff --git a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
index e62a45ac..cf92d16d 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 - 1, 2) + "px; top: "
+ elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth * 2, 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 5eea7aa1..136be9ac 100755
--- a/public/vendor/codemirror/addon/scroll/simplescrollbars.css
+++ b/public/vendor/codemirror/addon/scroll/simplescrollbars.css
@@ -38,8 +38,9 @@
.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
position: absolute;
- background: #bcd;
+ background: #ccc;
border-radius: 3px;
+ margin: 2px;
}
.CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
diff --git a/public/vendor/codemirror/addon/scroll/simplescrollbars.js b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
index f78353a1..4f0d0d0f 100755
--- a/public/vendor/codemirror/addon/scroll/simplescrollbars.js
+++ b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
@@ -75,14 +75,13 @@
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 + "px";
+ (buttonSize - 4) + "px";
this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
this.pos * (this.size / this.total) + "px";
};