You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/09/09 11:53:39 UTC
[19/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins
to 8aad450
Update codemirror to v2.38
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8905089f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8905089f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8905089f
Branch: refs/heads/1867-feature-plugins
Commit: 8905089f3f94e7b0ad781e9cbdd57f5127830c0a
Parents: 1cf1612
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Aug 19 13:19:37 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Sep 9 11:16:43 2013 +0200
----------------------------------------------------------------------
src/fauxton/assets/css/codemirror.css | 31 +-
src/fauxton/assets/js/libs/codemirror.js | 1596 ++++++++++++-------------
2 files changed, 798 insertions(+), 829 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/8905089f/src/fauxton/assets/css/codemirror.css
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/css/codemirror.css b/src/fauxton/assets/css/codemirror.css
index fb5b6d5..3fcbc44 100644
--- a/src/fauxton/assets/css/codemirror.css
+++ b/src/fauxton/assets/css/codemirror.css
@@ -9,8 +9,7 @@
}
.CodeMirror-scroll {
- overflow-x: auto;
- overflow-y: hidden;
+ overflow: auto;
height: 300px;
/* This is needed to prevent an IE[67] bug where the scrolled content
is visible outside of the scrolling box. */
@@ -20,13 +19,11 @@
/* Vertical scrollbar */
.CodeMirror-scrollbar {
- float: right;
+ position: absolute;
+ right: 0; top: 0;
overflow-x: hidden;
overflow-y: scroll;
-
- /* This corrects for the 1px gap introduced to the left of the scrollbar
- by the rule for .CodeMirror-scrollbar-inner. */
- margin-left: -1px;
+ z-index: 5;
}
.CodeMirror-scrollbar-inner {
/* This needs to have a nonzero width in order for the scrollbar to appear
@@ -69,10 +66,6 @@
white-space: pre;
cursor: text;
}
-.CodeMirror-lines * {
- /* Necessary for throw-scrolling to decelerate properly on Safari. */
- pointer-events: none;
-}
.CodeMirror pre {
-moz-border-radius: 0;
@@ -87,6 +80,7 @@
word-wrap: normal;
line-height: inherit;
color: inherit;
+ overflow: visible;
}
.CodeMirror-wrap pre {
@@ -152,18 +146,31 @@ div.CodeMirror-selected { background: #d9d9d9; }
.cm-s-default span.cm-error {color: #f00;}
.cm-s-default span.cm-qualifier {color: #555;}
.cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-bracket {color: #997;}
.cm-s-default span.cm-tag {color: #170;}
.cm-s-default span.cm-attribute {color: #00c;}
.cm-s-default span.cm-header {color: blue;}
.cm-s-default span.cm-quote {color: #090;}
.cm-s-default span.cm-hr {color: #999;}
.cm-s-default span.cm-link {color: #00c;}
+span.cm-negative {color: #d44;}
+span.cm-positive {color: #292;}
span.cm-header, span.cm-strong {font-weight: bold;}
span.cm-em {font-style: italic;}
span.cm-emstrong {font-style: italic; font-weight: bold;}
span.cm-link {text-decoration: underline;}
+span.cm-invalidchar {color: #f00;}
+
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+
+@media print {
+
+ /* Hide the cursor when printing */
+ .CodeMirror pre.CodeMirror-cursor {
+ visibility: hidden;
+ }
+}
+