diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /scss | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'scss')
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 87 |
1 files changed, 43 insertions, 44 deletions
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 00d8b5f0..9bf540cd 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss | |||
@@ -186,72 +186,71 @@ | |||
186 | /*opacity: 0.7;*/ | 186 | /*opacity: 0.7;*/ |
187 | /*}*/ | 187 | /*}*/ |
188 | 188 | ||
189 | /*// Selection Tool Options */ | 189 | // Selection Tool Options |
190 | /*.topAlignUp {*/ | 190 | .topAlignUp { |
191 | 191 | ||
192 | /*@include background-pos(8,2,26px,23px);*/ | 192 | @include background-pos(8,2,26px,23px); |
193 | /*}*/ | 193 | } |
194 | 194 | ||
195 | /*.rightAlignUp {*/ | 195 | .rightAlignUp { |
196 | 196 | ||
197 | /*@include background-pos(9,2,26px,23px);*/ | 197 | @include background-pos(9,2,26px,23px); |
198 | /*}*/ | 198 | } |
199 | 199 | ||
200 | /*.bottomAlignUp {*/ | 200 | .bottomAlignUp { |
201 | 201 | ||
202 | /*@include background-pos(10,2,26px,23px);*/ | 202 | @include background-pos(10,2,26px,23px); |
203 | /*}*/ | 203 | } |
204 | 204 | ||
205 | /*.verticalLeftUp {*/ | 205 | .verticalLeftUp { |
206 | 206 | ||
207 | /*@include background-pos(11,2,26px,23px);*/ | 207 | @include background-pos(11,2,26px,23px); |
208 | /*}*/ | 208 | } |
209 | 209 | ||
210 | /*.verticalCenterUp {*/ | 210 | .verticalCenterUp { |
211 | 211 | ||
212 | /*@include background-pos(12,2,26px,23px);*/ | 212 | @include background-pos(12,2,26px,23px); |
213 | /*}*/ | 213 | } |
214 | 214 | ||
215 | /*.verticalRightUp {*/ | 215 | .verticalRightUp { |
216 | 216 | ||
217 | /*@include background-pos(13,2,26px,23px);*/ | 217 | @include background-pos(13,2,26px,23px); |
218 | /*}*/ | 218 | } |
219 | 219 | ||
220 | /*.distRightUp {*/ | 220 | .distRightUp { |
221 | 221 | ||
222 | /*@include background-pos(0,3,26px,23px);*/ | 222 | @include background-pos(0,3,26px,23px); |
223 | /*}*/ | 223 | } |
224 | 224 | ||
225 | /*.distLeftUp {*/ | 225 | .distLeftUp { |
226 | 226 | ||
227 | /*@include background-pos(14,2,26px,23px);*/ | 227 | @include background-pos(14,2,26px,23px); |
228 | /*}*/ | 228 | } |
229 | 229 | ||
230 | /*.distCenterUp {*/ | 230 | .distCenterUp { |
231 | 231 | ||
232 | /*@include background-pos(2,3,26px,23px);*/ | 232 | @include background-pos(2,3,26px,23px); |
233 | /*}*/ | 233 | } |
234 | 234 | ||
235 | /*.distTopUp {*/ | 235 | .distTopUp { |
236 | 236 | ||
237 | /*@include background-pos(1,3,26px,23px);*/ | 237 | @include background-pos(1,3,26px,23px); |
238 | /*}*/ | 238 | } |
239 | |||
240 | /*.distBottomUp {*/ | ||
241 | 239 | ||
242 | /*@include background-pos(3,3,26px,23px);*/ | 240 | .distBottomUp { |
243 | /*}*/ | ||
244 | 241 | ||
245 | /*.distVCenterUp {*/ | 242 | @include background-pos(3,3,26px,23px); |
243 | } | ||
246 | 244 | ||
247 | /*@include background-pos(15,2,26px,23px);*/ | 245 | .distVCenterUp { |
248 | /*}*/ | ||
249 | 246 | ||
250 | /*.bucketToolUp {*/ | 247 | @include background-pos(15,2,26px,23px); |
251 | /*@include background-pos(11,0,26px,23px);*/ | 248 | } |
252 | /*}*/ | ||
253 | 249 | ||
254 | /*.pencilToolUp {*/ | 250 | .bucketToolUp { |
255 | /*@include background-pos(9,1,26px,23px);*/ | 251 | @include background-pos(11,0,26px,23px); |
256 | /*}*/ | 252 | } |
257 | 253 | ||
254 | .pencilToolUp { | ||
255 | @include background-pos(9,1,26px,23px); | ||
256 | } | ||