diff options
author | John Mayhew | 2012-05-07 16:30:19 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/document/templates/montage-web | |
parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/document/templates/montage-web')
-rwxr-xr-x | js/document/templates/montage-web/default_html.css | 9 | ||||
-rwxr-xr-x | js/document/templates/montage-web/index.html | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css index 08e39f22..e62a20a9 100755 --- a/js/document/templates/montage-web/default_html.css +++ b/js/document/templates/montage-web/default_html.css | |||
@@ -10,6 +10,15 @@ 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 | } |
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 630794a4..caebc8d0 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
@@ -29,20 +29,10 @@ | |||
29 | } | 29 | } |
30 | </script> | 30 | </script> |
31 | 31 | ||
32 | <style> | ||
33 | div { | ||
34 | width: 4000px; | ||
35 | height: 300px; | ||
36 | background: red; | ||
37 | } | ||
38 | </style> | ||
39 | |||
40 | </head> | 32 | </head> |
41 | 33 | ||
42 | <body> | 34 | <body> |
43 | 35 | <style></style> | |
44 | <!--<div>IPSUM</div>--> | ||
45 | |||
46 | </body> | 36 | </body> |
47 | 37 | ||
48 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |