diff options
| author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
| commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
| tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/document/templates | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/document/templates')
| -rwxr-xr-x | js/document/templates/montage-html/index.html | 3 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/default_html.css | 2 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 5 |
3 files changed, 4 insertions, 6 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 @@ | |||
| 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-web/default_html.css b/js/document/templates/montage-web/default_html.css index db069d4e..08e39f22 100755 --- a/js/document/templates/montage-web/default_html.css +++ b/js/document/templates/montage-web/default_html.css | |||
| @@ -11,7 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | .active-element-outline { | 13 | .active-element-outline { |
| 14 | outline: #adff2f solid 2px; | 14 | outline: #adff2f solid 2px; |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | .nj-preset-transition { | 17 | .nj-preset-transition { |
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 90b0f7fd..630794a4 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/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> |
| @@ -42,7 +41,7 @@ | |||
| 42 | 41 | ||
| 43 | <body> | 42 | <body> |
| 44 | 43 | ||
| 45 | <div>IPSUM</div> | 44 | <!--<div>IPSUM</div>--> |
| 46 | 45 | ||
| 47 | </body> | 46 | </body> |
| 48 | 47 | ||