aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-05-17 11:06:20 -0700
committerhwc4872012-05-17 11:06:20 -0700
commit0a3c703ce285941da20167a6d04b13b7eced23be (patch)
treee87019bcc3356c58dc93d982af2cfe16b582974b
parent1e649405d66f17d6acddb9055b181bba7ad70566 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
-rwxr-xr-xcss/ninja.css154
-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
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html14
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js6
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html24
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css1
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html27
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js49
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.css8
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html19
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js51
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css17
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html32
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js48
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js8
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js18
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html23
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js83
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.css6
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html31
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.js25
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html14
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js10
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.css3
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html71
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js30
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css16
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html33
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js126
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html32
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.js14
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.css1
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html46
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js47
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css28
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html55
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js1
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
-rwxr-xr-xjs/controllers/color-controller.js16
-rwxr-xr-xjs/data/tools-data.js76
-rwxr-xr-xjs/mediators/keyboard-mediator.js43
-rwxr-xr-xjs/ninja.reel/ninja.js6
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js2836
-rwxr-xr-xjs/panels/properties.reel/properties.css15
-rw-r--r--js/tools/BrushTool.js2
-rwxr-xr-xjs/tools/FillTool.js7
-rwxr-xr-xjs/tools/InkBottleTool.js2
-rwxr-xr-xjs/tools/LineTool.js6
-rwxr-xr-xjs/tools/OvalTool.js4
-rwxr-xr-xjs/tools/PenTool.js6
-rwxr-xr-xjs/tools/PencilTool.js32
-rwxr-xr-xjs/tools/RectTool.js4
-rwxr-xr-xjs/tools/TagTool.js5
-rwxr-xr-xscss/imports/scss/_PanelUI.scss13
-rwxr-xr-xscss/imports/scss/_Tools.scss317
-rwxr-xr-xscss/imports/scss/_toolbar.scss124
95 files changed, 2430 insertions, 2308 deletions
diff --git a/css/ninja.css b/css/ninja.css
index cd7a35ab..682dfc9d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -518,10 +518,6 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b
518 518
519#pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; } 519#pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; }
520 520
521.subToolHolderPanel { margin-left: 42px; }
522
523.subToolPanel { margin-top: -6px; }
524
525.properties_panel { overflow-x: hidden; color: white; } 521.properties_panel { overflow-x: hidden; color: white; }
526 522
527.properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; } 523.properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; }
@@ -669,25 +665,25 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
669 665
670nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } 666nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
671 667
672.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); } 668.subToolHolderPanel { margin-left: 42px; padding: 6px; float: left; }
673 669
674.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } 670.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; }
675 671
676.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } 672.subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
677 673
678.toolSeparator { height: 1px; width: 30px; } 674.toolOptionsFloatChildren > * { float: left; }
679 675
680.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } 676.toolOptionsSpacer { margin-right: 9px; }
681 677
682.toolSeparatorMiddle { margin-top: 0px; margin-bottom: 0px; } 678.toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; }
683 679
684.toolSeparatorBottom { margin-top: 0px; margin-bottom: 3px; } 680.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; }
685 681
686.toolImageBase { padding: 0px; width: 26px; height: 23px; opacity: 0.7; background-repeat: no-repeat; } 682.subToolHolderPanel input.toolOptsRadioButton { width: 24px; height: 24px; margin: 0px 5px 0px 0px; padding: 0px; cursor: pointer; border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background: none; background-repeat: no-repeat; background-position: center center; -webkit-transform: scale(0.9); }
687 683
688.toolImageBase:hover { opacity: 1.0; } 684.subToolHolderPanel input.toolOptsRadioButton:hover { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); }
689 685
690.drawingMode { outline: blue solid thin; } 686.subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; background-position: center center; background-repeat: no-repeat; -webkit-transform: scale(1); }
691 687
692.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } 688.textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; }
693 689
@@ -703,13 +699,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
703 699
704.cornerRadius:hover, .cornerRadius:active { opacity: 1; } 700.cornerRadius:hover, .cornerRadius:active { opacity: 1; }
705 701
706.cornerRadius.topLeft { -webkit-transform: rotate(0deg); } 702.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; }
707 703
708.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: -2px; } 704.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: 3px; margin-top: 1p