diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/lib/codemirror.css | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/lib/codemirror.css')
| -rw-r--r-- | imports/codemirror/lib/codemirror.css | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/imports/codemirror/lib/codemirror.css b/imports/codemirror/lib/codemirror.css index 5eadb247..2d79f4aa 100644 --- a/imports/codemirror/lib/codemirror.css +++ b/imports/codemirror/lib/codemirror.css | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | /* This is needed to prevent an IE[67] bug where the scrolled content | 9 | /* This is needed to prevent an IE[67] bug where the scrolled content |
| 10 | is visible outside of the scrolling box. */ | 10 | is visible outside of the scrolling box. */ |
| 11 | position: relative; | 11 | position: relative; |
| 12 | outline: none; | ||
| 12 | } | 13 | } |
| 13 | 14 | ||
| 14 | .CodeMirror-gutter { | 15 | .CodeMirror-gutter { |
| @@ -27,6 +28,7 @@ | |||
| 27 | } | 28 | } |
| 28 | .CodeMirror-lines { | 29 | .CodeMirror-lines { |
| 29 | padding: .4em; | 30 | padding: .4em; |
| 31 | white-space: pre; | ||
| 30 | } | 32 | } |
| 31 | 33 | ||
| 32 | .CodeMirror pre { | 34 | .CodeMirror pre { |