diff options
| author | Jose Antonio Marquez | 2012-05-04 14:00:54 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-05-04 14:00:54 -0700 |
| commit | 9c0bda09a502472768f6dd5090a882d11be58d23 (patch) | |
| tree | 28eb75165553daa979be3bc9223d35d875a008dc /scss | |
| parent | 2456f0d60f642016135aa0f96126cb3249343757 (diff) | |
| parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
| download | ninja-9c0bda09a502472768f6dd5090a882d11be58d23.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'scss')
| -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 { |