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 /scss/imports | |
| parent | 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff) | |
| parent | 8964e070fa760d23c2de272ca36b8d9beba6007d (diff) | |
| download | ninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'scss/imports')
| -rw-r--r-- | scss/imports/scss/_Stage.scss | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index 587903d2..6206f27f 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
| @@ -188,9 +188,7 @@ | |||
| 188 | 188 | ||
| 189 | #mainContent .CodeMirror-scroll { | 189 | #mainContent .CodeMirror-scroll { |
| 190 | height: 100%; | 190 | height: 100%; |
| 191 | overflow: scroll; | 191 | overflow: auto; |
| 192 | overflow-x: auto; | ||
| 193 | overflow-y: auto; | ||
| 194 | } | 192 | } |
| 195 | 193 | ||
| 196 | .montage-editor-frame { | 194 | .montage-editor-frame { |