diff options
author | hwc487 | 2012-04-27 14:35:46 -0700 |
---|---|---|
committer | hwc487 | 2012-04-27 14:35:46 -0700 |
commit | 1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch) | |
tree | 3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/document/templates/montage-web | |
parent | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/document/templates/montage-web')
-rwxr-xr-x | js/document/templates/montage-web/default_html.css | 2 | ||||
-rwxr-xr-x | js/document/templates/montage-web/index.html | 5 |
2 files changed, 3 insertions, 4 deletions
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 | ||