diff options
| author | Valerio Virgillito | 2012-05-03 23:01:31 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-03 23:01:31 -0700 |
| commit | 60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (patch) | |
| tree | 9bfa4cc0fdb3a39abf151c05d013f2cde7aad296 /scss | |
| parent | dca94d9d1e2a6a113356b685df991472ea3e5576 (diff) | |
| parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
| download | ninja-60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e.tar.gz | |
Merge branch 'refs/heads/master' into tag-2.0
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 { |