diff options
author | John Mayhew | 2012-05-07 16:30:19 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /imports/codemirror/lib/codemirror.css | |
parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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 { |