aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 15:55:15 -0800
committerValerio Virgillito2012-02-23 15:55:15 -0800
commitabb3e1bdc15e8ba74ffad4cca63c656b718f7890 (patch)
treef745764fa56ed045eea17697d6285c0e951a23ec
parent41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
downloadninja-abb3e1bdc15e8ba74ffad4cca63c656b718f7890.tar.gz
Fixing the selection tool properties icons.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat
-rwxr-xr-xcss/ninja.css75
-rwxr-xr-xscss/imports/scss/_toolbar.scss87
2 files changed, 75 insertions, 87 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 4d450208..f085f6be 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -212,6 +212,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
212 212
213#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } 213#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
214 214
215.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
216
217.montage-editor { padding: 0px; word-wrap: normal; }
218
215.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } 219.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
216 220
217.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } 221.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }
@@ -888,49 +892,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
888/*width: 26px;*/ 892/*width: 26px;*/
889/*opacity: 0.7;*/ 893/*opacity: 0.7;*/
890/*}*/ 894/*}*/
891/*// Selection Tool Options */ 895.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
892/*.topAlignUp {*/ 896
893/*@include background-pos(8,2,26px,23px);*/ 897.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
894/*}*/ 898
895/*.rightAlignUp {*/ 899.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
896/*@include background-pos(9,2,26px,23px);*/ 900
897/*}*/ 901.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
898/*.bottomAlignUp {*/ 902
899/*@include background-pos(10,2,26px,23px);*/ 903.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
900/*}*/ 904
901/*.verticalLeftUp {*/ 905.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
902/*@include background-pos(11,2,26px,23px);*/ 906
903/*}*/ 907.distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
904/*.verticalCenterUp {*/ 908
905/*@include background-pos(12,2,26px,23px);*/ 909.distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
906/*}*/ 910
907/*.verticalRightUp {*/ 911.distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
908/*@include background-pos(13,2,26px,23px);*/ 912
909/*}*/ 913.distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
910/*.distRightUp {*/ 914
911/*@include background-pos(0,3,26px,23px);*/ 915.distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; }
912/*}*/ 916
913/*.distLeftUp {*/ 917.distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
914/*@include background-pos(14,2,26px,23px);*/ 918
915/*}*/ 919.bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; }
916/*.distCenterUp {*/ 920
917/*@include background-pos(2,3,26px,23px);*/ 921.pencilToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; }
918/*}*/ 922
919/*.distTopUp {*/
920/*@include background-pos(1,3,26px,23px);*/
921/*}*/
922/*.distBottomUp {*/
923/*@include background-pos(3,3,26px,23px);*/
924/*}*/
925/*.distVCenterUp {*/
926/*@include background-pos(15,2,26px,23px);*/
927/*}*/
928/*.bucketToolUp {*/
929/*@include background-pos(11,0,26px,23px);*/
930/*}*/
931/*.pencilToolUp {*/
932/*@include background-pos(9,1,26px,23px);*/
933/*}*/
934.blueDiv { background: blue; opacity: 0.2; } 923.blueDiv { background: blue; opacity: 0.2; }
935 924
936::-webkit-scrollbar { width: 11px; height: 11px; } 925::-webkit-scrollbar { width: 11px; height: 11px; }
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}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:08:29 +0000