aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-03 17:09:07 -0700
committerNivesh Rajbhandari2012-05-03 17:09:07 -0700
commit8be6e94b57f4bd6e28754a6113b4d6a401365e13 (patch)
tree19f48f969ab872b9ef46cc4e7d6c2b9d2544cd4d /scss
parentc14b8d9fd1acde98ffc427b0bbdba7d1442c39a4 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-8be6e94b57f4bd6e28754a6113b4d6a401365e13.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'scss')
-rw-r--r--scss/imports/scss/_Stage.scss4
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 {