diff options
author | Valerio Virgillito | 2012-05-30 10:33:16 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-30 10:33:16 -0700 |
commit | 0c2f181ca565f9c3b68fcfdc7124416e2e2fa647 (patch) | |
tree | f6d5300c528a69305abd30ffea1beee016241375 /scss/imports | |
parent | 31b094ee21102f99a4021d505bc3a28527c9e23d (diff) | |
parent | d4f2df2a7b3ec79fc54e17f09195dbc37331f051 (diff) | |
download | ninja-0c2f181ca565f9c3b68fcfdc7124416e2e2fa647.tar.gz |
Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into document-bindings-fix
Conflicts:
js/stage/stage-deps.js
js/stage/stage.reel/stage.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss/imports')
-rw-r--r-- | scss/imports/scss/_Stage.scss | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index ed8d0656..39a98d82 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
@@ -140,7 +140,7 @@ | |||
140 | padding: 0px; | 140 | padding: 0px; |
141 | top: 0px; | 141 | top: 0px; |
142 | left: 0px; | 142 | left: 0px; |
143 | z-index: 6; | 143 | z-index: 7; |
144 | } | 144 | } |
145 | 145 | ||
146 | 146 | ||
@@ -151,7 +151,7 @@ | |||
151 | padding: 0px; | 151 | padding: 0px; |
152 | top: 0px; | 152 | top: 0px; |
153 | left: 0px; | 153 | left: 0px; |
154 | z-index: 5; | 154 | z-index: 6; |
155 | } | 155 | } |
156 | 156 | ||
157 | .layoutCanvas { | 157 | .layoutCanvas { |
@@ -161,6 +161,16 @@ | |||
161 | padding: 0px; | 161 | padding: 0px; |
162 | top: 0px; | 162 | top: 0px; |
163 | left: 0px; | 163 | left: 0px; |
164 | z-index: 5; | ||
165 | } | ||
166 | |||
167 | .gridCanvas { | ||
168 | position: absolute; | ||
169 | margin: 0px; | ||
170 | border: none; | ||
171 | padding: 0px; | ||
172 | top: 0px; | ||
173 | left: 0px; | ||
164 | z-index: 4; | 174 | z-index: 4; |
165 | } | 175 | } |
166 | 176 | ||