aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-06 07:54:11 -0700
committerPushkar Joshi2012-06-06 07:54:11 -0700
commitcfa1402ac2ce831a83a9d4263d06c452c157a414 (patch)
treeadb8f1f1ad1c4dd1e7e9eee1bd206f1ec338d20c /scss/imports
parent8606ee7ec851cb0a971e7556eba5d9386f1b3639 (diff)
parent5ba54dc275b07e7b2d0ed14751761d1e663d3d14 (diff)
downloadninja-cfa1402ac2ce831a83a9d4263d06c452c157a414.tar.gz
Merge branch 'pentool' into brushtool
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