merge for gh-pages build 0.9.34

sverweij · Oct 12, 2014 · 61a0a63 · 61a0a63
2 parents 075acef + 50fa7c4
commit 61a0a63
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 82 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.34
+0.9.35
diff --git a/src/lib/codemirror/codemirror.css b/src/lib/codemirror/codemirror.css
@@ -58,6 +58,10 @@
   border: 0;
   background: #7e7;
 }
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
 .cm-animate-fat-cursor {
   width: auto;
   border: 0;
@@ -214,6 +218,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-lines {
   cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
   /* Reset some styles that the rest of the page might have set */
@@ -273,7 +278,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
-  z-index: 1;
+  z-index: 3;
 }
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
@@ -300,3 +305,6 @@ div.CodeMirror-cursors {
     visibility: hidden;
   }
 }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }