aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorhwc4872012-06-04 10:21:24 -0700
committerhwc4872012-06-04 10:21:24 -0700
commit468b20e7fbc27882f8a37c83afd86d1d06c52afd (patch)
tree6c2a9c26429c4852961bdabba8f3dad45499be85 /scss/imports
parent3f5351c5d75080727953caf5d8d9a312c1c9391b (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-468b20e7fbc27882f8a37c83afd86d1d06c52afd.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'scss/imports')
-rw-r--r--scss/imports/scss/_Stage.scss14
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