diff options
| author | Valerio Virgillito | 2012-05-03 16:18:11 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-03 16:18:11 -0700 |
| commit | f7a493acab51684bc557174ebaba6e80a4869df7 (patch) | |
| tree | 3d1940acfba351b1aaba4c82a251522de286a0ae /scss/imports | |
| parent | 882f4f4b7427170ff3c3fc76a0ccd727c022bb63 (diff) | |
| parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
| download | ninja-f7a493acab51684bc557174ebaba6e80a4869df7.tar.gz | |
Merge branch 'refs/heads/master' into data-id
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 { |