diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/stage/stage.reel/stage.css | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/stage/stage.reel/stage.css')
-rwxr-xr-x | js/stage/stage.reel/stage.css | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 2271cd8a..2c2e30d3 100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css | |||
@@ -14,6 +14,8 @@ | |||
14 | 14 | ||
15 | .montage-editor-container { | 15 | .montage-editor-container { |
16 | z-index: 8; | 16 | z-index: 8; |
17 | display: none; | ||
18 | position: absolute; | ||
17 | } | 19 | } |
18 | 20 | ||
19 | .stageAndScenesContainer .montage-editor { | 21 | .stageAndScenesContainer .montage-editor { |
@@ -64,3 +66,4 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun | |||
64 | .cm-s-rubyblue .activeline {background: #3E7087; !important} | 66 | .cm-s-rubyblue .activeline {background: #3E7087; !important} |
65 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} | 67 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} |
66 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} | 68 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} |
69 | |||