aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-15 14:23:19 -0800
committerArmen Kesablyan2012-02-15 14:23:19 -0800
commitbb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b (patch)
treecae6abe170b5ac861747dcd6db5a7c19ab34858c
parentace16ef22b3ff32663504df7720af481d76987d6 (diff)
downloadninja-bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b.tar.gz
Tool Icons : New layout
Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rw-r--r--css/ninja.css179
-rw-r--r--images/tools/Tool-3DRotate.pngbin0 -> 1484 bytes
-rw-r--r--images/tools/Tool-3DRotateStage.pngbin0 -> 1477 bytes
-rw-r--r--images/tools/Tool-3DTranslate.pngbin0 -> 1474 bytes
-rw-r--r--images/tools/Tool-3DTranslateStage.pngbin0 -> 1454 bytes
-rw-r--r--images/tools/Tool-Erase.pngbin0 -> 1421 bytes
-rw-r--r--images/tools/Tool-EyeDropper.pngbin0 -> 1314 bytes
-rw-r--r--images/tools/Tool-Fill.pngbin0 -> 1394 bytes
-rw-r--r--images/tools/Tool-FillColor.pngbin0 -> 1111 bytes
-rw-r--r--images/tools/Tool-PaintBrush.pngbin0 -> 1293 bytes
-rw-r--r--images/tools/Tool-Pan.pngbin0 -> 1723 bytes
-rw-r--r--images/tools/Tool-Pen.pngbin0 -> 1298 bytes
-rw-r--r--images/tools/Tool-Pencil.pngbin0 -> 1230 bytes
-rw-r--r--images/tools/Tool-Rectangle.pngbin0 -> 1179 bytes
-rw-r--r--images/tools/Tool-Selection.pngbin0 -> 1289 bytes
-rw-r--r--images/tools/Tool-Stroke.pngbin0 -> 1117 bytes
-rw-r--r--images/tools/Tool-Subselect.pngbin0 -> 1227 bytes
-rw-r--r--images/tools/Tool-Tag.pngbin0 -> 1197 bytes
-rw-r--r--images/tools/Tool-Text.pngbin0 -> 1142 bytes
-rw-r--r--images/tools/Tool-Zoom.pngbin0 -> 1362 bytes
-rw-r--r--js/components/layout/tool-button.reel/tool-button.html7
-rw-r--r--js/components/layout/tool-button.reel/tool-button.js21
-rw-r--r--js/components/layout/tools-list.reel/tools-list.html17
-rw-r--r--js/data/tools-data.js66
-rw-r--r--scss/.sass-cache/5fc5391a1d3f0cc8c82108187482ad8e2d9a4dfd/ninja.scsscbin0 -> 4467 bytes
-rw-r--r--scss/.sass-cache/a47e87879ba03b17bf638aaaf0d186d50bf1ca11/_colors.scsscbin0 -> 17819 bytes
-rw-r--r--scss/.sass-cache/a47e87879ba03b17bf638aaaf0d186d50bf1ca11/_fonts.scsscbin0 -> 1872 bytes
-rw-r--r--scss/.sass-cache/a47e87879ba03b17bf638aaaf0d186d50bf1ca11/_mixins.scsscbin0 -> 4555 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Base.scsscbin0 -> 25106 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Components.scsscbin0 -> 3384 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MainWindow.scssc426
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MenuUI.scsscbin0 -> 6093 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_MontageOverrides.scsscbin0 -> 2665 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_PanelUI.scssc1638
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_ScrollBars.scsscbin0 -> 14691 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Stage.scsscbin0 -> 13754 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_Tools.scssc592
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_UserContent.scsscbin0 -> 2196 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_mixins.scsscbin0 -> 2734 bytes
-rw-r--r--scss/.sass-cache/bf7669b9251ffa007260472c0d41aebd1dfdcf8a/_toolbar.scsscbin0 -> 15338 bytes
-rw-r--r--scss/compass_app_log.txt16
-rw-r--r--scss/imports/scss/_Tools.scss24
-rw-r--r--scss/imports/scss/_toolbar.scss328
-rwxr-xr-xscss/ninja.scss1
44 files changed, 2956 insertions, 359 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 934bd60b..20fa85f5 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -210,10 +210,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
210 210
211#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } 211#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
212 212
213.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
214
215.montage-editor { padding: 0px; word-wrap: normal; }
216
217.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } 213.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
218 214
219.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; } 215.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; }
@@ -670,16 +666,10 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
670 666
671nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } 667nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
672 668
673.toolButton { width: 26px; height: 23px; padding: 0px; margin: 1px; border-width: 1px; border-style: solid; }
674
675.subToolButton { float: left; } 669.subToolButton { float: left; }
676 670
677.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } 671.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; }
678 672
679.toolButton:active { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; }
680
681.toolButtonSelected { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; }
682
683.toolSeparator { height: 1px; width: 30px; } 673.toolSeparator { height: 1px; width: 30px; }
684 674
685.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } 675.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; }
@@ -816,118 +806,123 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
816 806
817#zoomToolOptionHolder input.zoom-option { background: none; } 807#zoomToolOptionHolder input.zoom-option { background: none; }
818 808
819.SelectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 809#toolsPanelContent { width: 40px; }
820
821.SelectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
822
823.SubselectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
824
825.SubselectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
826
827.RotateTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
828
829.RotateTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
830
831.Translate3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
832
833.Translate3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
834
835.TagToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
836
837.TagToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
838
839.PenToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
840
841.PenToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
842
843.TextToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
844
845.TextToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
846
847.ShapeContainerPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
848
849.ShapeContainerUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
850
851.OvalToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
852
853.OvalToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
854
855.RectangleToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
856
857.RectangleToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
858
859.LineToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
860
861.LineToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
862
863.PencilToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
864
865.PencilToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
866
867.BrushToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
868
869.BrushToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
870
871.FillToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
872 810
873.FillToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 811.toolsList { width: 30px; margin: auto; }
874 812
875.EyedropperToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 813.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; }
876 814
877.EyedropperToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 815.toolbutton { width: 30px; height: 30px; background-position: center center; background-repeat: no-repeat; -webkit-border-radius: 4px; opacity: 0.6; margin-bottom: 2px; }
878 816
879.EraserToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 817.toolsList .toolbutton:hover, .toolsList .active { box-shadow: inset 0px 0px 8px #999; opacity: 1; }
880 818
881.EraserToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 819.toolsList .active { background-color: #555; }
882 820
883.RotateStageTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 821.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); }
884 822
885.RotateStageTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 823.SubselectionTool { background-image: url("../images/tools/Tool-Subselect.png"); }
886 824
887.TranslateStageTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 825.RotateTool3D { background-image: url("../images/tools/Tool-3DRotate.png"); }
888 826
889.TranslateStageTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 827.Translate3D { background-image: url("../images/tools/Tool-3DTranslate.png"); }
890 828
891.PanToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 829.TagTool { background-image: url("../images/tools/Tool-Tag.png"); }
892 830
893.PanToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 831.PenTool { background-image: url("../images/tools/Tool-Pen.png"); }
894 832
895.ZoomToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 833.TextTool { background-image: url("../images/tools/Tool-Text.png"); }
896 834
897.ZoomToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 835.ShapeContainer { background-image: url("../images/tools/Tool-Rectangle.png"); }
898 836
899.InkBottleToolPressed { background-image: url("../images/tools/inkbottle_down.png"); background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 837.OvalTool { background-image: url("../images/tools/Tool-Oval.png"); }
900 838
901.InkBottleToolUnpressed { background-image: url("../images/tools/inkbottle_down.png"); background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 839.RectangleTool { background-image: url("../images/tools/Tool-Rectangle.png"); }
902 840
903.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 841.LineTool { background-image: url("../images/tools/Tool-Stroke.png"); }
904 842
905.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 843.PencilTool { background-image: url("../images/tools/Tool-Pencil.png"); }
906 844
907.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 845.BrushTool { background-image: url("../images/tools/Tool-PaintBrush.png"); }
908 846
909.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 847.FillTool { background-image: url("../images/tools/Tool-Fill.png"); }
910 848
911.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 849.EyedropperTool { background-image: url("../images/tools/Tool-EyeDropper.png"); }
912 850
913.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } 851.EraserTool { background-image: url("../images/tools/Tool-Erase.png"); }
914 852