Merge branch 'gh-pages' into firefox-back-button-fix

mozilla · May 22, 2012 · 6f10ca9 · 6f10ca9
2 parents 386951c + 24a8dbd
commit 6f10ca9
Show file tree

Hide file tree

Showing 12 changed files with 1,260 additions and 839 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,29 @@
 This is a friendly HTML editor that uses [slowparse][] and [hacktionary][]
 to provide ultra-friendly real-time help to novice webmakers.
 
+## Updating CodeMirror
+
+In the `codemirror2` directory is a mini-distribution of [CodeMirror][]
+which contains only the files necessary for HTML editing. It can be updated
+with the following Python script, if it is run from the root directory
+of the repository and the value of `NEW_CODEMIRROR_PATH` is changed:
+
+```python
+import os
+
+NEW_CODEMIRROR_PATH = "/path/to/new/codemirror/version"
+OUR_CODEMIRROR_PATH = os.path.abspath("codemirror2")
+
+for dirpath, dirnames, filenames in os.walk(OUR_CODEMIRROR_PATH):
+    for filename in filenames:
+        ourpath = os.path.join(dirpath, filename)
+        relpath = os.path.relpath(ourpath, OUR_CODEMIRROR_PATH)
+        newpath = os.path.join(NEW_CODEMIRROR_PATH, relpath)
+        if os.path.exists(newpath):
+            print "copying %s" % newpath
+            open(ourpath, "wb").write(open(newpath, "rb").read())
+```
+
   [slowparse]: https://github.com/toolness/slowparse
   [hacktionary]: https://github.com/toolness/hacktionary
+  [CodeMirror]: http://codemirror.net/
diff --git a/codemirror2/lib/codemirror.css b/codemirror2/lib/codemirror.css
@@ -9,6 +9,7 @@
   /* This is needed to prevent an IE[67] bug where the scrolled content
      is visible outside of the scrolling box. */
   position: relative;
+  outline: none;
 }
 
 .CodeMirror-gutter {
@@ -27,6 +28,7 @@
 }
 .CodeMirror-lines {
   padding: .4em;
+  white-space: pre;
 }
 
 .CodeMirror pre {
@@ -40,38 +42,73 @@
   padding: 0; margin: 0;
   white-space: pre;
   word-wrap: normal;
+  line-height: inherit;
 }
 
 .CodeMirror-wrap pre {
   word-wrap: break-word;
   white-space: pre-wrap;
+  word-break: normal;
 }
 .CodeMirror-wrap .CodeMirror-scroll {
   overflow-x: hidden;
 }
 
 .CodeMirror textarea {
-  font-family: inherit !important;
-  font-size: inherit !important;
+  outline: none !important;
 }
 
-.CodeMirror-cursor {
+.CodeMirror pre.CodeMirror-cursor {
   z-index: 10;
   position: absolute;
   visibility: hidden;
-  border-left: 1px solid black !important;
+  border-left: 1px solid black;
+  border-right:none;
+  width:0;
 }
-.CodeMirror-focused .CodeMirror-cursor {
+.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+.CodeMirror-focused pre.CodeMirror-cursor {
   visibility: visible;
 }
 
-span.CodeMirror-selected {
-  background: #ccc !important;
-  color: HighlightText !important;
-}
-.CodeMirror-focused span.CodeMirror-selected {
-  background: Highlight !important;
+div.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
+
+.CodeMirror-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
 }
 
-.CodeMirror-matchingbracket {color: #0f0 !important;}
-.CodeMirror-nonmatchingbracket {color: #f22 !important;}
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.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-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}
+.cm-s-default span.cm-header {color: #a0a;}
+.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-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;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}