aboutsummaryrefslogtreecommitdiff
path: root/images
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 16:06:56 -0700
committerValerio Virgillito2012-05-16 16:06:56 -0700
commit92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch)
treee385beee8f2694596f6305bf90eb7eb4521de2e2 /images
parentbdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'images')
-rwxr-xr-ximages/optionsbar/link.pngbin1295 -> 1248 bytes
-rw-r--r--images/optionsbar/options3D/rotate-globally.pngbin0 -> 753 bytes
-rw-r--r--images/optionsbar/options3D/rotate-locally.pngbin0 -> 626 bytes
-rw-r--r--images/optionsbar/pen/penMinus.pngbin0 -> 392 bytes
-rw-r--r--images/optionsbar/pen/penPlus.pngbin0 -> 403 bytes
-rwxr-xr-ximages/optionsbar/rectangle/cornerRadius.pngbin2955 -> 1187 bytes
-rwxr-xr-ximages/optionsbar/selection/AlignBottom.pngbin2852 -> 2887 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignCenter.png (renamed from images/optionsbar/selection/alignHcenter.png)bin2859 -> 2859 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignMiddle.png (renamed from images/optionsbar/selection/alignVcenter.png)bin2864 -> 2864 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/ArrangeBringForward.png (renamed from images/tools/pencil_up.png)bin3101 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringToFront.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendBackward.pngbin0 -> 2873 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendToBack.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/DistBottom.pngbin0 -> 2888 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/DistMiddle.png (renamed from images/optionsbar/selection/distVcenter.png)bin2868 -> 2868 bytes
-rw-r--r--images/optionsbar/tag/canvas-tag.pngbin0 -> 1529 bytes
-rw-r--r--images/optionsbar/tag/custom-tag.pngbin0 -> 738 bytes
-rw-r--r--images/optionsbar/tag/div-tag.pngbin0 -> 637 bytes
-rw-r--r--images/optionsbar/tag/img-tag.pngbin0 -> 715 bytes
-rw-r--r--images/optionsbar/tag/vid-tag.pngbin0 -> 389 bytes
-rw-r--r--images/optionsbar/text/AlignCenter.pngbin0 -> 1045 bytes
-rw-r--r--images/optionsbar/text/AlignJustified.pngbin0 -> 1053 bytes
-rw-r--r--images/optionsbar/text/AlignLeft.pngbin0 -> 1032 bytes
-rw-r--r--images/optionsbar/text/AlignRight.pngbin0 -> 1033 bytes
-rw-r--r--images/optionsbar/text/BulletedList.pngbin0 -> 1060 bytes
-rw-r--r--images/optionsbar/text/NumberedList.pngbin0 -> 1144 bytes
-rwxr-xr-ximages/optionsbar/unlinked.pngbin1581 -> 1193 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_minus.pngbin3117 -> 648 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_plus.pngbin3128 -> 691 bytes
-rw-r--r--images/tools/Tool-FillColor.pngbin1111 -> 1400 bytes
-rw-r--r--[-rwxr-xr-x]images/tools/inkbottle_cursor.png (renamed from images/tools/inkbottle_down.png)bin3352 -> 3352 bytes
-rwxr-xr-ximages/tools/pencil_down.pngbin3103 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-3d.pngbin2599 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-tag.pngbin6403 -> 0 bytes
34 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/link.png b/images/optionsbar/link.png
index 7a3f166a..dc834675 100755
--- a/images/optionsbar/link.png
+++ b/images/optionsbar/link.png
Binary files differ
diff --git a/images/optionsbar/options3D/rotate-globally.png b/images/optionsbar/options3D/rotate-globally.png
new file mode 100644
index 00000000..64c144b4
--- /dev/null
+++ b/images/optionsbar/options3D/rotate-globally.png
Binary files differ
diff --git a/images/optionsbar/options3D/rotate-locally.png b/images/optionsbar/options3D/rotate-locally.png
new file mode 100644
index 00000000..b0950675
--- /dev/null
+++ b/images/optionsbar/options3D/rotate-locally.png
Binary files differ
diff --git a/images/optionsbar/pen/penMinus.png b/images/optionsbar/pen/penMinus.png
new file mode 100644
index 00000000..eac4a742
--- /dev/null
+++ b/images/optionsbar/pen/penMinus.png
Binary files differ
diff --git a/images/optionsbar/pen/penPlus.png b/images/optionsbar/pen/penPlus.png
new file mode 100644
index 00000000..e7dd565f
--- /dev/null
+++ b/images/optionsbar/pen/penPlus.png
Binary files differ
diff --git a/images/optionsbar/rectangle/cornerRadius.png b/images/optionsbar/rectangle/cornerRadius.png
index 106c530b..d7bb2d44 100755
--- a/images/optionsbar/rectangle/cornerRadius.png
+++ b/images/optionsbar/rectangle/cornerRadius.png
Binary files differ
diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png
index 842cb057..f68d62c8 100755
--- a/images/optionsbar/selection/AlignBottom.png
+++ b/images/optionsbar/selection/AlignBottom.png
Binary files differ
diff --git a/images/optionsbar/selection/alignHcenter.png b/images/optionsbar/selection/AlignCenter.png
index 64bb4014..64bb4014 100755..100644
--- a/images/optionsbar/selection/alignHcenter.png
+++ b/images/optionsbar/selection/AlignCenter.png
Binary files differ
diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/AlignMiddle.png
index 03dffad5..03dffad5 100755..100644
--- a/images/optionsbar/selection/alignVcenter.png
+++ b/images/optionsbar/selection/AlignMiddle.png
Binary files differ
diff --git a/images/tools/pencil_up.png b/images/optionsbar/selection/ArrangeBringForward.png
index f7b44c7c..55861b5a 100755..100644
--- a/images/tools/pencil_up.png
+++ b/images/optionsbar/selection/ArrangeBringForward.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeBringToFront.png b/images/optionsbar/selection/ArrangeBringToFront.png
new file mode 100644
index 00000000..1344e618
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeBringToFront.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeSendBackward.png b/images/optionsbar/selection/ArrangeSendBackward.png
new file mode 100644
index 00000000..2e8ea0ad
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeSendBackward.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeSendToBack.png b/images/optionsbar/selection/ArrangeSendToBack.png
new file mode 100644
index 00000000..699ae5ba
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeSendToBack.png
Binary files differ
diff --git a/images/optionsbar/selection/DistBottom.png b/images/optionsbar/selection/DistBottom.png
new file mode 100644
index 00000000..c7ed75ce
--- /dev/null
+++ b/images/optionsbar/selection/DistBottom.png
Binary files differ
diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/DistMiddle.png
index bb32a441..bb32a441 100755..100644
--- a/images/optionsbar/selection/distVcenter.png
+++ b/images/optionsbar/selection/DistMiddle.png
Binary files differ
diff --git a/images/optionsbar/tag/canvas-tag.png b/images/optionsbar/tag/canvas-tag.png
new file mode 100644
index 00000000..daf6036e
--- /dev/null
+++ b/images/optionsbar/tag/canvas-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/custom-tag.png b/images/optionsbar/tag/custom-tag.png
new file mode 100644
index 00000000..98c560ad
--- /dev/null
+++ b/images/optionsbar/tag/custom-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/div-tag.png b/images/optionsbar/tag/div-tag.png
new file mode 100644
index 00000000..2a2bac2e
--- /dev/null
+++ b/images/optionsbar/tag/div-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/img-tag.png b/images/optionsbar/tag/img-tag.png
new file mode 100644
index 00000000..7a1c6e79
--- /dev/null
+++ b/images/optionsbar/tag/img-tag.png
Binary files differ
diff --git a/images/optionsbar/tag/vid-tag.png b/images/optionsbar/tag/vid-tag.png
new file mode 100644
index 00000000..e72bac5a
--- /dev/null
+++ b/images/optionsbar/tag/vid-tag.png
Binary files differ
diff --git a/images/optionsbar/text/AlignCenter.png b/images/optionsbar/text/AlignCenter.png
new file mode 100644
index 00000000..6c95a9a6
--- /dev/null
+++ b/images/optionsbar/text/AlignCenter.png
Binary files differ
diff --git a/images/optionsbar/text/AlignJustified.png b/images/optionsbar/text/AlignJustified.png
new file mode 100644
index 00000000..7248a8f7
--- /dev/null
+++ b/images/optionsbar/text/AlignJustified.png
Binary files differ
diff --git a/images/optionsbar/text/AlignLeft.png b/images/optionsbar/text/AlignLeft.png
new file mode 100644
index 00000000..07f964f9
--- /dev/null
+++ b/images/optionsbar/text/AlignLeft.png
Binary files differ
diff --git a/images/optionsbar/text/AlignRight.png b/images/optionsbar/text/AlignRight.png
new file mode 100644
index 00000000..9ecec819
--- /dev/null
+++ b/images/optionsbar/text/AlignRight.png
Binary files differ
diff --git a/images/optionsbar/text/BulletedList.png b/images/optionsbar/text/BulletedList.png
new file mode 100644
index 00000000..ed6dbab7
--- /dev/null
+++ b/images/optionsbar/text/BulletedList.png
Binary files differ
diff --git a/images/optionsbar/text/NumberedList.png b/images/optionsbar/text/NumberedList.png
new file mode 100644
index 00000000..43a8cbc0
--- /dev/null
+++ b/images/optionsbar/text/NumberedList.png
Binary files differ
diff --git a/images/optionsbar/unlinked.png b/images/optionsbar/unlinked.png
index c209dc7d..49a6efa0 100755
--- a/images/optionsbar/unlinked.png
+++ b/images/optionsbar/unlinked.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_minus.png b/images/optionsbar/zoom/zoom_minus.png
index e337dd68..530c89d5 100755
--- a/images/optionsbar/zoom/zoom_minus.png
+++ b/images/optionsbar/zoom/zoom_minus.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_plus.png b/images/optionsbar/zoom/zoom_plus.png
index c92d839d..de47235c 100755
--- a/images/optionsbar/zoom/zoom_plus.png
+++ b/images/optionsbar/zoom/zoom_plus.png
Binary files differ
diff --git a/images/tools/Tool-FillColor.png b/images/tools/Tool-FillColor.png
index f0580ef9..87c2ce7c 100644
--- a/images/tools/Tool-FillColor.png
+++ b/images/tools/Tool-FillColor.png
Binary files differ
diff --git a/images/tools/inkbottle_down.png b/images/tools/inkbottle_cursor.png
index f07d0d25..f07d0d25 100755..100644
--- a/images/tools/inkbottle_down.png
+++ b/images/tools/inkbottle_cursor.png
Binary files differ
diff --git a/images/tools/pencil_down.png b/images/tools/pencil_down.png
deleted file mode 100755
index 55b22eb2..00000000
--- a/images/tools/pencil_down.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/sprite-toolbar-3d.png b/images/tools/sprite-toolbar-3d.png
deleted file mode 100755
index d4746064..00000000
--- a/images/tools/sprite-toolbar-3d.png
+++ /dev/null
Binary files differ
diff --git a/images/tools/sprite-toolbar-tag.png b/images/tools/sprite-toolbar-tag.png
deleted file mode 100755
index 69b13ec3..00000000
--- a/images/tools/sprite-toolbar-tag.png
+++ /dev/null
Binary files differ