aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css183
-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 -> 1317 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-Line.pngbin0 -> 1117 bytes
-rw-r--r--images/tools/Tool-Oval.pngbin0 -> 1312 bytes
-rw-r--r--images/tools/Tool-PaintBrush.pngbin0 -> 1293 bytes
-rw-r--r--images/tools/Tool-Pan.pngbin0 -> 1473 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-Shape-14x14-Link.pngbin0 -> 1248 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Oval.pngbin0 -> 1227 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-BotLeft.pngbin0 -> 1193 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-BotRight.pngbin0 -> 1195 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-UpLeft.pngbin0 -> 1187 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-RoundedEdge-UpRight.pngbin0 -> 1200 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Square.pngbin0 -> 1034 bytes
-rw-r--r--images/tools/Tool-Shape-14x14-Unlink.pngbin0 -> 1193 bytes
-rw-r--r--images/tools/Tool-Shape-20x20-Link.pngbin0 -> 1345 bytes
-rw-r--r--images/tools/Tool-Shape-20x20-Unlink.pngbin0 -> 1307 bytes
-rw-r--r--images/tools/Tool-Square.pngbin0 -> 1033 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 -> 1214 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignCenter.pngbin0 -> 1045 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignLeft.pngbin0 -> 1032 bytes
-rw-r--r--images/tools/Tool-Text-16x16-AlignRight.pngbin0 -> 1033 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Bold.pngbin0 -> 1187 bytes
-rw-r--r--images/tools/Tool-Text-16x16-BulletedList.pngbin0 -> 1060 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Font.pngbin0 -> 1191 bytes
-rw-r--r--images/tools/Tool-Text-16x16-FontColor.pngbin0 -> 1188 bytes
-rw-r--r--images/tools/Tool-Text-16x16-FontSize.pngbin0 -> 1247 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Italics.pngbin0 -> 1130 bytes
-rw-r--r--images/tools/Tool-Text-16x16-NumberedList.pngbin0 -> 1144 bytes
-rw-r--r--images/tools/Tool-Text-16x16-StrikeThrough.pngbin0 -> 1174 bytes
-rw-r--r--images/tools/Tool-Text-16x16-URLLink.pngbin0 -> 1266 bytes
-rw-r--r--images/tools/Tool-Text-16x16-Underline.pngbin0 -> 1136 bytes
-rw-r--r--images/tools/Tool-Text.pngbin0 -> 1143 bytes
-rw-r--r--images/tools/Tool-Zoom.pngbin0 -> 1380 bytes
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js10
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html7
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js21
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html19
-rwxr-xr-xjs/components/textfield.reel/textfield.html2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css4
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.css2
-rwxr-xr-xjs/controllers/document-controller.js11
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
-rwxr-xr-xjs/data/tools-data.js50
-rw-r--r--js/helper-classes/RDGE/Materials/PulseMaterial.js12
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js11
-rwxr-xr-xjs/mediators/keyboard-mediator.js6
-rwxr-xr-xjs/ninja.reel/ninja.html3
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html6
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js117
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js27
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css117
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss17
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html24
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js15
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css13
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss21
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Span.reel/Span.html6
-rw-r--r--js/panels/Timeline/Span.reel/Span.js11
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss6
-rw-r--r--[-rwxr-xr-x]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html70
-rw-r--r--[-rwxr-xr-x]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js216
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css25
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html102
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js325
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css62
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss14
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html16
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js114
-rwxr-xr-xjs/panels/properties/content.reel/content.js15
-rw-r--r--scss/imports/scss/_MontageOverrides.scss4
-rwxr-xr-xscss/imports/scss/_Tools.scss33
-rwxr-xr-xscss/imports/scss/_toolbar.scss339
89 files changed, 1221 insertions, 857 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 96ae6caf..4d450208 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -212,10 +212,6 @@ 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
219.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } 215.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
220 216
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; } 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; }
@@ -672,16 +668,12 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
672 668
673nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } 669nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
674 670
675.toolButton { width: 26px; height: 23px; padding: 0px; margin: 1px; border-width: 1px; border-style: solid; } 671.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); }
676 672
677.subToolButton { float: left; } 673.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
678 674
679.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } 675.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; }
680 676
681.toolButton:active { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; }
682
683.toolButtonSelected { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; }
684
685.toolSeparator { height: 1px; width: 30px; } 677.toolSeparator { height: 1px; width: 30px; }
686 678
687.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } 679.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; }
@@ -818,118 +810,127 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
818 810
819#zoomToolOptionHolder input.zoom-option { background: none; } 811#zoomToolOptionHolder input.zoom-option { background: none; }
820 812
821.SelectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 813#toolsPanelContent { width: 40px; }
822
823.SelectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
824
825.SubselectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
826
827.SubselectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
828
829.RotateTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
830
831.RotateTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
832
833.Translate3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
834
835.Translate3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
836
837.TagToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
838
839.TagToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
840
841.PenToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; }
842
843.PenToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; }
844 814
845.TextToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 815.toolsList { width: 29px; margin: auto; }
846 816
847.TextToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 817.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; }
848 818
849.ShapeContainerPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 819.toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); }
850 820
851.ShapeContainerUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 821.toolbutton:hover, .toolbutton.active { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); opacity: 1; }
852 822
853.OvalToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 823.toolbutton:active { background-color: #8c8c8c; }
854 824
855.OvalToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 825.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; }
856 826
857.RectangleToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 827.SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); }
858 828
859.RectangleToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 829.SubselectionTool { background-image: url("../images/tools/Tool-Subselect.png"); }
860 830
861.LineToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } 831.RotateTool3D { background-image: url("../images/tools/Tool-3DRotate.png"); }
862 832
863.LineToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } 833.Translate3D { background-image: url("../images/tools/Tool-3DTranslate.png"); }
864 834
865.PencilToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png