aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-15 15:04:37 -0800
committerArmen Kesablyan2012-02-15 15:04:37 -0800
commit92873714dd6ffb259e6c5a27da2ade773d7b00f9 (patch)
treea69012ca5a62d3a023c98bfa8c1cdcde40b7c915
parent2a5484af59544a9dfdda854d707455f08a24fe69 (diff)
downloadninja-92873714dd6ffb259e6c5a27da2ade773d7b00f9.tar.gz
New Icons: Last set had imperfections
Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rw-r--r--css/ninja.css6
-rw-r--r--images/tools/Tool-EyeDropper.pngbin1314 -> 1317 bytes
-rw-r--r--images/tools/Tool-Pan.pngbin1723 -> 1473 bytes
-rw-r--r--images/tools/Tool-Tag.pngbin1197 -> 1214 bytes
-rw-r--r--images/tools/Tool-Text.pngbin1142 -> 1143 bytes
-rw-r--r--images/tools/Tool-Zoom.pngbin1362 -> 1380 bytes
-rw-r--r--js/components/layout/tools-list.reel/tools-list.html12
-rw-r--r--js/data/tools-data.js28
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scsscbin2665 -> 2814 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scsscbin15338 -> 15676 bytes
-rw-r--r--scss/compass_app_log.txt17
-rw-r--r--scss/imports/scss/_MontageOverrides.scss4
-rw-r--r--scss/imports/scss/_toolbar.scss8
13 files changed, 55 insertions, 20 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 20fa85f5..62642787 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -860,9 +860,11 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
860 860
861.InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } 861.InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); }
862 862
863.toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; }
864
863.toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; } 865.toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; }
864 866
865.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; } 867.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; margin-top: 3px; }
866 868
867.toolsList .colortoolbar div.cpe_colortoolbar_container { margin: 0; } 869.toolsList .colortoolbar div.cpe_colortoolbar_container { margin: 0; }
868 870
@@ -985,4 +987,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
985 987
986.montage-popup-container { background: none; } 988.montage-popup-container { background: none; }
987 989
990.montage-invisible { display: none; }
991
988/*77*/ 992/*77*/
diff --git a/images/tools/Tool-EyeDropper.png b/images/tools/Tool-EyeDropper.png
index e73e0a79..61ffc7ba 100644
--- a/images/tools/Tool-EyeDropper.png
+++ b/images/tools/Tool-EyeDropper.png
Binary files differ
diff --git a/images/tools/Tool-Pan.png b/images/tools/Tool-Pan.png
index 948a6a4c..91906549 100644
--- a/images/tools/Tool-Pan.png
+++ b/images/tools/Tool-Pan.png
Binary files differ
diff --git a/images/tools/Tool-Tag.png b/images/tools/Tool-Tag.png
index bae5f0ad..93a441ad 100644
--- a/images/tools/Tool-Tag.png
+++ b/images/tools/Tool-Tag.png
Binary files differ
diff --git a/images/tools/Tool-Text.png b/images/tools/Tool-Text.png
index c5d18d63..741dfb65 100644
--- a/images/tools/Tool-Text.png
+++ b/images/tools/Tool-Text.png
Binary files differ
diff --git a/images/tools/Tool-Zoom.png b/images/tools/Tool-Zoom.png
index 6abad024..c6b06a6f 100644
--- a/images/tools/Tool-Zoom.png
+++ b/images/tools/Tool-Zoom.png
Binary files differ
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index c47359bf..2c5617e5 100644
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -26,15 +26,15 @@
26 }, 26 },
27 27
28 "groupLine": { 28 "groupLine": {
29 "module": "js/components/layout/tool-button.reel", 29 "module": "montage/ui/condition.reel",
30 "name": "ToolButton", 30 "name": "Condition",
31 "properties": { 31 "properties": {
32 "element": {"#": "groupLine"} 32 "element": {"#": "groupLine"}
33 }, 33 },
34 "bindings": { 34 "bindings": {
35 "data": { 35 "condition": {
36 "boundObject": {"@": "repetition1"}, 36 "boundObject": {"@": "repetition1"},
37 "boundObjectPropertyPath": "objectAtCurrentIteration", 37 "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
38 "oneway": true 38 "oneway": true
39 } 39 }
40 } 40 }
@@ -178,7 +178,9 @@
178 <div id="toolsList" class="toolsList"> 178 <div id="toolsList" class="toolsList">
179 <div id="toolscontainer" class="toolscontainer"> 179 <div id="toolscontainer" class="toolscontainer">
180 <div id="toolbutton" class="toolbutton"></div> 180 <div id="toolbutton" class="toolbutton"></div>
181 <hr id="groupLine" /> 181 <div id="groupLine">
182 <hr />
183 </div>
182 </div> 184 </div>
183 <!-- TODO: Remove and add as a component --> 185 <!-- TODO: Remove and add as a component -->
184 <div id="colortoolbar"></div> 186 <div id="colortoolbar"></div>
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8356c422..4847fa7c 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, {
28 "action": "SubselectionTool", 28 "action": "SubselectionTool",
29 "toolTip": "Subselect Tool", 29 "toolTip": "Subselect Tool",
30 "cursor": "auto", 30 "cursor": "auto",
31 "lastInGroup": false, 31 "lastInGroup": true,
32 "container": false, 32 "container": false,
33 "selected": false 33 "selected": false
34 }, 34 },
@@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, {
153 "action": "FillTool", 153 "action": "FillTool",
154 "toolTip": "Fill Tool", 154 "toolTip": "Fill Tool",
155 "cursor": "url('images/tools/bucket_down.png'), default", 155 "cursor": "url('images/tools/bucket_down.png'), default",
156 "lastInGroup": false, 156 "lastInGroup": true,
157 "container": false, 157 "container": false,
158 "selected": false 158 "selected": false
159 }, 159 },
@@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, {
168// "container": false, 168// "container": false,
169// "selected": false 169// "selected": false
170// }, 170// },
171// { 171 {
172// "id": "EyedropperTool", 172 "id": "EyedropperTool",
173// "properties": "eyedropperProperties", 173 "properties": "eyedropperProperties",
174// "spriteSheet": true, 174 "spriteSheet": true,
175// "action": "EyedropperTool", 175 "action": "EyedropperTool",
176// "toolTip": "Eyedropper Tool", 176 "toolTip": "Eyedropper Tool",
177// "cursor": "url('images/tools/eyedropper_down.png'), default", 177 "cursor": "url('images/tools/eyedropper_down.png'), default",
178// "lastInGroup": false, 178 "lastInGroup": false,
179// "container": false, 179 "container": false,
180// "selected": false 180 "selected": false
181// }, 181 },
182// { 182// {
183// "id": "EraserTool", 183// "id": "EraserTool",
184// "properties": "eraserProperties", 184// "properties": "eraserProperties",
@@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, {
219 "action": "ZoomTool", 219 "action": "ZoomTool",
220 "toolTip": "Zoom Tool (Z)", 220 "toolTip": "Zoom Tool (Z)",
221 "cursor": "url('images/cursors/zoom.png'),default", 221 "cursor": "url('images/cursors/zoom.png'),default",
222 "lastInGroup": false, 222 "lastInGroup": true,
223 "container": false, 223 "container": false,
224 "selected": false 224 "selected": false
225 } 225 }
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
index 02e1f256..ae35faa4 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scssc
Binary files differ
diff --git a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
index d5541090..6fc7c8bd 100644
--- a/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
+++ b/scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scssc
Binary files differ
diff --git a/scss/compass_app_log.txt b/scss/compass_app_log.txt
index ad936de7..c4795cdf 100644
--- a/scss/compass_app_log.txt
+++ b/scss/compass_app_log.txt
@@ -14,3 +14,20 @@
142012-02-15 13:48:27 overwrite ../css/ninja.css 142012-02-15 13:48:27 overwrite ../css/ninja.css
152012-02-15 13:49:27 overwrite ../css/ninja.css 152012-02-15 13:49:27 overwrite ../css/ninja.css
162012-02-15 13:49:35 identical ../css/ninja.css 162012-02-15 13:49:35 identical ../css/ninja.css
172012-02-15 14:37:00 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
182012-02-15 14:37:00 overwrite ../css/ninja.css
192012-02-15 14:44:12 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
202012-02-15 14:44:12 identical ../css/ninja.css
212012-02-15 14:44:15 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
222012-02-15 14:44:15 identical ../css/ninja.css
232012-02-15 14:44:34 error ninja.scss (Line 232: Invalid CSS after ".montage-invisible": expected "{", was "")
242012-02-15 14:44:34 identical ../css/ninja.css
252012-02-15 14:44:57 overwrite ../css/ninja.css
262012-02-15 14:45:37 overwrite ../css/ninja.css
272012-02-15 14:52:43 overwrite ../css/ninja.css
282012-02-15 14:52:57 overwrite ../css/ninja.css
292012-02-15 14:53:28 overwrite ../css/ninja.css
302012-02-15 14:53:42 overwrite ../css/ninja.css
312012-02-15 14:54:10 overwrite ../css/ninja.css
322012-02-15 14:55:22 identical ../css/ninja.css
332012-02-15 14:55:28 overwrite ../css/ninja.css
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
index 65b9ede0..6e728863 100644
--- a/scss/imports/scss/_MontageOverrides.scss
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -16,4 +16,8 @@
16} 16}
17.montage-popup-container { 17.montage-popup-container {
18 background: none; 18 background: none;
19}
20
21.montage-invisible {
22 display: none;
19} \ No newline at end of file 23} \ No newline at end of file
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 44178b24..4d460bad 100644
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -131,6 +131,11 @@
131 background-image:url("../images/tools/Tool-FillColor.png"); 131 background-image:url("../images/tools/Tool-FillColor.png");
132} 132}
133 133
134.toolsList .colortoolbar {
135 padding-left: 1px;
136 padding-top:4px;
137}
138
134.toolsList .colortoolbar button 139.toolsList .colortoolbar button
135{ 140{
136 width: 27px; 141 width: 27px;
@@ -146,6 +151,7 @@
146 width: 27px; 151 width: 27px;
147 height: 27px; 152 height: 27px;
148 margin: 0; 153 margin: 0;
154 margin-top:3px;
149} 155}
150 156
151.toolsList .colortoolbar div.cpe_colortoolbar_container 157.toolsList .colortoolbar div.cpe_colortoolbar_container
@@ -153,6 +159,8 @@
153 margin: 0; 159 margin: 0;