aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--_scss/compass_app_log.txt109
-rw-r--r--_scss/imports/scss/_Base.scss7
-rw-r--r--_scss/imports/scss/_PanelUI.scss2
-rw-r--r--_scss/imports/themes/default/_colors.scss2
-rw-r--r--css/ninja.css8
-rw-r--r--js/components/tools-properties/rect-properties.reel/rect-properties.js2
-rw-r--r--js/controllers/elements/canvas-controller.js14
-rw-r--r--js/controllers/elements/element-controller.js61
-rw-r--r--js/controllers/elements/shapes-controller.js28
-rw-r--r--js/data/pi/pi-data.js48
-rw-r--r--js/helper-classes/3D/draw-utils.js28
-rw-r--r--js/helper-classes/3D/math-utils.js54
-rw-r--r--js/helper-classes/3D/snap-manager.js11
-rw-r--r--js/helper-classes/Properties3D.js82
-rw-r--r--js/mediators/element-mediator.js5
-rw-r--r--js/models/properties-3d.js6
-rw-r--r--js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js4
-rw-r--r--js/panels/properties/content.reel/content.js7
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.html12
-rw-r--r--js/panels/properties/sections/three-d-view.reel/three-d-view.js86
-rw-r--r--js/stage/layout.js67
-rw-r--r--js/stage/stage.reel/stage.js63
-rw-r--r--js/tools/PanTool.js33
-rw-r--r--js/tools/SelectionTool.js1
-rw-r--r--js/tools/ZoomTool.js39
-rw-r--r--js/tools/drawing-tool-base.js1
27 files changed, 345 insertions, 438 deletions
diff --git a/.gitignore b/.gitignore
index b92bd629..3a3a8d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
20 20
21cloud/ 21cloud/
22 22
23/.idea/scopes/scope_settings.xml \ No newline at end of file 23/.idea/scopes/scope_settings.xml
24/_scss/compass_app_log.txt \ No newline at end of file
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
deleted file mode 100644
index 463846ba..00000000
--- a/_scss/compass_app_log.txt
+++ /dev/null
@@ -1,109 +0,0 @@
12011-09-02 13:25:28 overwrite ../css/ninja.css
22011-09-02 13:38:07 overwrite ../css/ninja.css
32011-09-02 13:38:27 overwrite ../css/ninja.css
42011-09-02 13:39:16 overwrite ../css/ninja.css
52011-09-02 13:42:04 overwrite ../css/ninja.css
62011-09-02 13:42:48 overwrite ../css/ninja.css
72011-09-14 16:53:51 overwrite ../css/ninja.css
82011-09-14 16:54:56 overwrite ../css/ninja.css
92011-09-14 16:55:59 overwrite ../css/ninja.css
102011-09-14 16:57:48 overwrite ../css/ninja.css
112011-09-14 17:00:26 overwrite ../css/ninja.css
122011-09-14 17:02:28 error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",")
132011-09-14 17:02:28 overwrite ../css/ninja.css
142011-09-14 17:04:10 overwrite ../css/ninja.css
152011-09-14 17:05:49 overwrite ../css/ninja.css
162011-09-14 17:08:00 overwrite ../css/ninja.css
172011-09-14 17:08:36 overwrite ../css/ninja.css
182011-09-14 17:09:27 overwrite ../css/ninja.css
192011-09-14 17:10:02 overwrite ../css/ninja.css
202011-09-14 17:11:37 overwrite ../css/ninja.css
212011-09-14 17:12:37 overwrite ../css/ninja.css
222011-09-14 17:14:35 overwrite ../css/ninja.css
232011-09-14 17:15:36 overwrite ../css/ninja.css
242011-09-14 17:16:33 overwrite ../css/ninja.css
252011-09-14 17:17:11 overwrite ../css/ninja.css
262011-09-14 17:17:19 overwrite ../css/ninja.css
272011-09-14 17:18:27 overwrite ../css/ninja.css
282011-09-14 17:19:06 overwrite ../css/ninja.css
292011-09-14 17:19:22 overwrite ../css/ninja.css
302011-09-14 17:19:43 overwrite ../css/ninja.css
312011-09-14 17:20:16 overwrite ../css/ninja.css
322011-09-14 17:20:39 overwrite ../css/ninja.css
332011-09-14 17:21:09 overwrite ../css/ninja.css
342011-09-14 17:21:51 overwrite ../css/ninja.css
352011-09-14 17:22:33 overwrite ../css/ninja.css
362011-09-15 13:56:59 overwrite ../css/ninja.css
372011-09-15 13:57:29 overwrite ../css/ninja.css
382011-10-03 13:19:40 overwrite ../css/ninja.css
392011-10-03 13:21:00 overwrite ../css/ninja.css
402011-10-03 13:21:21 overwrite ../css/ninja.css
412011-10-03 13:26:42 overwrite ../css/ninja.css
422011-10-03 13:44:20 overwrite ../css/ninja.css
432011-10-03 13:44:54 overwrite ../css/ninja.css
442011-10-03 13:45:14 overwrite ../css/ninja.css
452011-10-03 13:46:26 overwrite ../css/ninja.css
462011-10-03 13:46:29 overwrite ../css/ninja.css
472011-10-04 15:06:33 overwrite ../css/ninja.css
482011-10-04 15:06:36 overwrite ../css/ninja.css
492011-10-04 15:06:43 overwrite ../css/ninja.css
502011-10-04 15:15:22 overwrite ../css/ninja.css
512011-10-11 16:02:52 overwrite ../css/ninja.css
522011-10-13 00:13:38 identical ../css/ninja.css
532011-10-13 00:14:12 overwrite ../css/ninja.css
542011-10-13 00:15:03 overwrite ../css/ninja.css
552011-10-26 15:19:00 overwrite ../css/ninja.css
562011-10-26 15:19:33 overwrite ../css/ninja.css
572011-11-22 16:21:56 overwrite ../css/ninja.css
582011-11-22 17:47:41 overwrite ../css/ninja.css
592011-11-30 01:14:42 overwrite ../css/ninja.css
602011-11-30 01:15:04 overwrite ../css/ninja.css
612011-11-30 01:15:09 overwrite ../css/ninja.css
622011-11-30 16:54:38 overwrite ../css/ninja.css
632011-12-01 11:38:06 overwrite ../css/ninja.css
642011-12-01 11:38:11 overwrite ../css/ninja.css
652011-12-07 12:10:05 overwrite ../css/ninja.css
662011-12-07 12:10:22 overwrite ../css/ninja.css
672011-12-07 12:12:11 overwrite ../css/ninja.css
682011-12-07 12:14:43 overwrite ../css/ninja.css
692011-12-07 17:32:10 overwrite ../css/ninja.css
702011-12-07 17:55:01 overwrite ../css/ninja.css
712011-12-15 14:51:46 overwrite ../css/ninja.css
722011-12-15 14:52:46 overwrite ../css/ninja.css
732011-12-15 14:52:59 overwrite ../css/ninja.css
742011-12-15 14:53:25 overwrite ../css/ninja.css
752011-12-20 21:56:57 overwrite ../css/ninja.css
762011-12-30 15:41:28 overwrite ../css/ninja.css
772011-12-30 15:43:24 overwrite ../css/ninja.css
782011-12-30 15:45:49 overwrite ../css/ninja.css
792012-01-12 16:26:20 overwrite ../css/ninja.css
802012-01-12 16:26:22 overwrite ../css/ninja.css
812012-01-12 16:26:25 overwrite ../css/ninja.css
822012-01-19 11:06:48 overwrite ../css/ninja.css
832012-01-19 11:06:55 overwrite ../css/ninja.css
842012-01-19 11:11:16 overwrite ../css/ninja.css
852012-01-19 14:30:22 overwrite ../css/ninja.css
862012-01-19 14:35:47 overwrite ../css/ninja.css
872012-01-19 14:38:18 overwrite ../css/ninja.css
882012-01-19 14:40:59 overwrite ../css/ninja.css
892012-01-19 14:41:24 overwrite ../css/ninja.css
902012-01-20 15:13:41 overwrite ../css/ninja.css
912012-01-20 15:14:27 overwrite ../css/ninja.css
922012-01-20 15:15:32 overwrite ../css/ninja.css
932012-01-20 15:16:38 overwrite ../css/ninja.css
942012-01-20 15:17:03 overwrite ../css/ninja.css
952012-01-20 15:17:39 overwrite ../css/ninja.css
962012-01-27 16:08:54 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
972012-01-27 16:08:54 overwrite ../css/ninja.css
982012-01-27 16:09:18 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
992012-01-27 16:09:18 overwrite ../css/ninja.css
1002012-01-27 16:09:34 error ninja.scss (Line 93: Invalid CSS after " z-index:": expected pseudoclass or pseudoelement, was " 2;")
1012012-01-27 16:09:34 overwrite ../css/ninja.css
1022012-01-27 16:11:17 error ninja.scss (Line 20: Invalid CSS after "...nately it doesn": expected "{", was "'t seem to work...")
1032012-01-27 16:11:17 overwrite ../css/ninja.css
1042012-01-27 16:11:57 error ninja.scss (Line 106: Invalid CSS after "...how the corner.": expected class name, was "Setting the ::-...")
1052012-01-27 16:11:57 overwrite ../css/ninja.css
1062012-01-27 16:12:29 overwrite ../css/ninja.css
1072012-01-27 16:13:46 overwrite ../css/ninja.css
1082012-01-27 16:14:02 overwrite ../css/ninja.css
1092012-01-31 17:22:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 77faa8f3..8a743174 100644
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -127,15 +127,18 @@ button.nj-skinned {
127 padding: 4px; 127 padding: 4px;
128 border: 1px $color-input-border solid; 128 border: 1px $color-input-border solid;
129 background-color: $color-menu-bg; 129 background-color: $color-menu-bg;
130 background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); 130 background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%);
131 border-radius: 4px; 131 border-radius: 4px;
132 color: $color-menu-text; 132 color: $color-menu-text;
133 text-transform: uppercase; 133 text-transform: uppercase;
134 cursor: pointer; 134 cursor: pointer;
135 text-shadow: 1px 1px 1px $color-app-shadow 135 text-shadow: 1px 1px 1px $color-app-shadow
136} 136}
137button.nj-skinned:active {
138 background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%);
139}
137button.nj-skinned:hover { 140button.nj-skinned:hover {
138 background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 141 -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
139} 142}
140 143
141// Radio buttons 144// Radio buttons
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss
index ac82adf8..21ada556 100644
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/_scss/imports/scss/_PanelUI.scss
@@ -390,7 +390,7 @@ ul.treeComponent > img:first-child
390// 390//
391#pp-container-assets .pp-scroll-linked, 391#pp-container-assets .pp-scroll-linked,
392#pp-container-list .pp-scroll-linked { 392#pp-container-list .pp-scroll-linked {
393 width: 420px; 393 //width: 420px;
394} 394}
395 395
396 396
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss
index 34d5ffc9..2a7b8191 100644
--- a/_scss/imports/themes/default/_colors.scss
+++ b/_scss/imports/themes/default/_colors.scss
@@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40);
15$color-radio-shadow: rgba(200,200,200,0.5); 15$color-radio-shadow: rgba(200,200,200,0.5);
16$color-radio-gradient-top: rgb(100,100,100); 16$color-radio-gradient-top: rgb(100,100,100);
17$color-radio-gradient-bottom: rgb(60,60,60); 17$color-radio-gradient-bottom: rgb(60,60,60);
18$color-formgrad-top: rgb(80,80,80);
19$color-formgrad-bottom: rgb(60,60,60);
18$color-radio-bg: rgb(0,0,0); 20$color-radio-bg: rgb(0,0,0);
19$color-radio: rgb(200,200,200); 21$color-radio: rgb(200,200,200);
20$color-input: rgb(255,255,255); 22$color-input: rgb(255,255,255);
diff --git a/css/ninja.css b/css/ninja.css
index bf71955f..8ce60a10 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -34,9 +34,11 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button { -webkit-appearan
34 34
35input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; } 35input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; }
36 36
37button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #646464