diff options
author | hwc487 | 2012-02-27 13:41:31 -0800 |
---|---|---|
committer | hwc487 | 2012-02-27 13:41:31 -0800 |
commit | 124ad4709780013615d2ff1da05ace9887ee7709 (patch) | |
tree | e8de66216e338f4cba1a98c3a00473ead3daef9d | |
parent | a8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-124ad4709780013615d2ff1da05ace9887ee7709.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
47 files changed, 363 insertions, 145 deletions
diff --git a/css/ninja.css b/css/ninja.css index 4d450208..f085f6be 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -212,6 +212,10 @@ 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 | |||
215 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } | 219 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } |
216 | 220 | ||
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; } | 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; } |
@@ -888,49 +892,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
888 | /*width: 26px;*/ | 892 | /*width: 26px;*/ |
889 | /*opacity: 0.7;*/ | 893 | /*opacity: 0.7;*/ |
890 | /*}*/ | 894 | /*}*/ |
891 | /*// Selection Tool Options */ | 895 | .topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
892 | /*.topAlignUp {*/ | 896 | |
893 | /*@include background-pos(8,2,26px,23px);*/ | 897 | .rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
894 | /*}*/ | 898 | |
895 | /*.rightAlignUp {*/ | 899 | .bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
896 | /*@include background-pos(9,2,26px,23px);*/ | 900 | |
897 | /*}*/ | 901 | .verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
898 | /*.bottomAlignUp {*/ | 902 | |
899 | /*@include background-pos(10,2,26px,23px);*/ | 903 | .verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
900 | /*}*/ | 904 | |
901 | /*.verticalLeftUp {*/ | 905 | .verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
902 | /*@include background-pos(11,2,26px,23px);*/ | 906 | |
903 | /*}*/ | 907 | .distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } |
904 | /*.verticalCenterUp {*/ | 908 | |
905 | /*@include background-pos(12,2,26px,23px);*/ | 909 | .distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
906 | /*}*/ | 910 | |
907 | /*.verticalRightUp {*/ | 911 | .distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } |
908 | /*@include background-pos(13,2,26px,23px);*/ | 912 | |
909 | /*}*/ | 913 | .distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } |
910 | /*.distRightUp {*/ | 914 | |
911 | /*@include background-pos(0,3,26px,23px);*/ | 915 | .distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } |
912 | /*}*/ | 916 | |
913 | /*.distLeftUp {*/ | 917 | .distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } |
914 | /*@include background-pos(14,2,26px,23px);*/ | 918 | |
915 | /*}*/ | 919 | .bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; } |
916 | /*.distCenterUp {*/ | 920 | |
917 | /*@include background-pos(2,3,26px,23px);*/ | 921 | .pencilToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; } |
918 | /*}*/ | 922 | |
919 | /*.distTopUp {*/ | ||
920 | /*@include background-pos(1,3,26px,23px);*/ | ||
921 | /*}*/ | ||
922 | /*.distBottomUp {*/ | ||
923 | /*@include background-pos(3,3,26px,23px);*/ | ||
924 | /*}*/ | ||
925 | /*.distVCenterUp {*/ | ||
926 | /*@include background-pos(15,2,26px,23px);*/ | ||
927 | /*}*/ | ||
928 | /*.bucketToolUp {*/ | ||
929 | /*@include background-pos(11,0,26px,23px);*/ | ||
930 | /*}*/ | ||
931 | /*.pencilToolUp {*/ | ||
932 | /*@include background-pos(9,1,26px,23px);*/ | ||
933 | /*}*/ | ||
934 | .blueDiv { background: blue; opacity: 0.2; } | 923 | .blueDiv { background: blue; opacity: 0.2; } |
935 | 924 | ||
936 | ::-webkit-scrollbar { width: 11px; height: 11px; } | 925 | ::-webkit-scrollbar { width: 11px; height: 11px; } |
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 1d0ad776..9c8946c4 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | /* ComputedStyleSubPanel.js */ | 7 | /* ComputedStyleSubPanel.js */ |
2 | var Montage = require("montage").Montage, | 8 | var Montage = require("montage").Montage, |
3 | Component = require("montage/ui/component").Component; | 9 | Component = require("montage/ui/component").Component; |
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 79813c92..5ed46b3c 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | /* ComputedStyleSubPanel.js */ | 7 | /* ComputedStyleSubPanel.js */ |
2 | var Montage = require("montage").Montage, | 8 | var Montage = require("montage").Montage, |
3 | Component = require("montage/ui/component").Component, | 9 | Component = require("montage/ui/component").Component, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 1290aaac..1824c7c3 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -1,3 +1,8 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
1 | 6 | ||
2 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
3 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -153,21 +153,21 @@ 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, | ||
157 | "container": false, | ||
158 | "selected": false | ||
159 | }, | ||
160 | { | ||
161 | "id": "InkBottleTool", | ||
162 | "properties": "inkbottleProperties", | ||
163 | "spriteSheet": true, | ||
164 | "action": "InkBottleTool", | ||
165 | "toolTip": "Ink Bottle Tool", | ||
166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
156 | "lastInGroup": true, | 167 | "lastInGroup": true, |
157 | "container": false, | 168 | "container": false, |
158 | "selected": false | 169 | "selected": false |
159 | }, | 170 | }, |
160 | // { | ||
161 | // "id": "InkBottleTool", | ||
162 | // "properties": "inkbottleProperties", | ||
163 | // "spriteSheet": true, | ||
164 | // "action": "InkBottleTool",< |