Merge branch 'timeline-local' into timeline-multiselect

Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
author: Jon Reid 2012-05-15 11:24:53 -0700
committer: Jon Reid 2012-05-15 11:24:53 -0700
commit: 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
tree: d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/document/templates
parent: 53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parent: e33a4e58c271a9507082694a5268b840fdd05968 (diff)
download: ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
4 files changed, 15 insertions, 17 deletions
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index b3f68030..79c6cd51 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -24,8 +24,7 @@
        <script type="text/montage-serialization">
        {
            "owner": {
-                "module": "main.reel",
+                "prototype": "main.reel"
-                "name": "Main"
            }
        }
        </script>
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
index c8bc02fb..d1e839dc 100755
--- a/js/document/templates/montage-html/package.json
+++ b/js/document/templates/montage-html/package.json
@@ -3,6 +3,7 @@
           "lib": ""
       },
       "mappings": {
-           "montage": "../../../../node_modules/montage/"
+           "montage": "../../../../node_modules/montage/",
+           "montage-google": "../../../../node_modules/montage-google/"
       }
 }
 \ No newline at end of file
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index db069d4e..e62a20a9 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -10,8 +10,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
    -webkit-animation-name: none !important;
 }
+body {
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    -webkit-transform-style: preserve-3d;
+    -webkit-perspective: 1400px;
+}
 .active-element-outline {
-  outline: #adff2f solid 2px;
+    outline: #adff2f solid 2px;
 }
 .nj-preset-transition {
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 90b0f7fd..caebc8d0 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -24,26 +24,15 @@
        <script type="text/montage-serialization">
        {
            "owner": {
-                "module": "main.reel",
+                "prototype": "main.reel"
-                "name": "Main"
            }
        }
        </script>
-        <style>
-            div {
-                width: 4000px;
-                height: 300px;
-                background: red;
-            }
-        </style>
        </head>
        <body>
-                
+        <style></style>
-                <div>IPSUM</div>
        </body>
 </html>
 \ No newline at end of file
author	Jon Reid	2012-05-15 11:24:53 -0700
committer	Jon Reid	2012-05-15 11:24:53 -0700
commit	3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
tree	d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/document/templates
parent	53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parent	e33a4e58c271a9507082694a5268b840fdd05968 (diff)
download	ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz

diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html index b3f68030..79c6cd51 100755 --- a/js/document/templates/montage-html/index.html +++ b/js/document/templates/montage-html/index.html
@@ -24,8 +24,7 @@
24	<script type="text/montage-serialization">	24	<script type="text/montage-serialization">
25	{	25	{
26	"owner": {	26	"owner": {
27	"module": "main.reel",	27	"prototype": "main.reel"
28	"name": "Main"
29	}	28	}
30	}	29	}
31	</script>	30	</script>


diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/montage-html/package.json +++ b/js/document/templates/montage-html/package.json
@@ -3,6 +3,7 @@
3	"lib": ""	3	"lib": ""
4	},	4	},
5	"mappings": {	5	"mappings": {
6	"montage": "../../../../node_modules/montage/"	6	"montage": "../../../../node_modules/montage/",
		7	"montage-google": "../../../../node_modules/montage-google/"
7	}	8	}
8	} \ No newline at end of file	9	} \ No newline at end of file


diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css index db069d4e..e62a20a9 100755 --- a/js/document/templates/montage-web/default_html.css +++ b/js/document/templates/montage-web/default_html.css
@@ -10,8 +10,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
10	-webkit-animation-name: none !important;	10	-webkit-animation-name: none !important;
11	}	11	}
12		12
		13	body {
		14	margin: 0;
		15	padding: 0;
		16
		17	position: absolute;
		18	-webkit-transform-style: preserve-3d;
		19	-webkit-perspective: 1400px;
		20	}
		21
13	.active-element-outline {	22	.active-element-outline {
14	outline: #adff2f solid 2px;	23	outline: #adff2f solid 2px;
15	}	24	}
16		25
17	.nj-preset-transition {	26	.nj-preset-transition {


diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 90b0f7fd..caebc8d0 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html
@@ -24,26 +24,15 @@
24	<script type="text/montage-serialization">	24	<script type="text/montage-serialization">
25	{	25	{
26	"owner": {	26	"owner": {
27	"module": "main.reel",	27	"prototype": "main.reel"
28	"name": "Main"
29	}	28	}
30	}	29	}
31	</script>	30	</script>
32		31
33	<style>
34	div {
35	width: 4000px;
36	height: 300px;
37	background: red;
38	}
39	</style>
40
41	</head>	32	</head>
42		33
43	<body>	34	<body>
44		35	<style></style>
45	<div>IPSUM</div>
46
47	</body>	36	</body>
48		37
49	</html> \ No newline at end of file	38	</html> \ No newline at end of file