diff options
author | Jon Reid | 2012-05-04 14:56:24 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-04 14:56:24 -0700 |
commit | a6dd2917edcfeca1be7553e03281ddd538422ae1 (patch) | |
tree | e6846626bf1e967e80bcd652f6a76bb97abb1789 /css | |
parent | 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff) | |
parent | 8964e070fa760d23c2de272ca36b8d9beba6007d (diff) | |
download | ninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/css/ninja.css b/css/ninja.css index 650f3b08..297ed7cd 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -212,7 +212,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
212 | 212 | ||
213 | #mainContent .CodeMirror { width: 100%; height: 100%; background: white; } | 213 | #mainContent .CodeMirror { width: 100%; height: 100%; background: white; } |
214 | 214 | ||
215 | #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } | 215 | #mainContent .CodeMirror-scroll { height: 100%; overflow:auto; } |
216 | 216 | ||
217 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } | 217 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } |
218 | 218 | ||