diff options
author | Valerio Virgillito | 2012-05-14 14:38:48 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-14 14:38:48 -0700 |
commit | 8d367ec7b4749ad390a0e15bb0418efc60970b54 (patch) | |
tree | a6643741f2022aa934f3b39e9ad431a10cdb6752 /js/document | |
parent | 05db3c7df3126cbd770112cd26a39aab91a95c17 (diff) | |
parent | 734b6ad96d25bb67d0db4a0a75c331468e194809 (diff) | |
download | ninja-8d367ec7b4749ad390a0e15bb0418efc60970b54.tar.gz |
Merge pull request #226 from mqg734/Dom-Architecture
Fixing 3d to work in banner templates.
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/document-html.js | 2 | ||||
-rwxr-xr-x | js/document/templates/banner/index.html | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 4767271f..f8e88ede 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -107,7 +107,7 @@ exports.HtmlDocument = Montage.create(Component, { | |||
107 | //TODO: Why is this needed? | 107 | //TODO: Why is this needed? |
108 | this._liveNodeList = this.model.views.design.document.body.getElementsByTagName('*'); | 108 | this._liveNodeList = this.model.views.design.document.body.getElementsByTagName('*'); |
109 | //Initiliazing document model | 109 | //Initiliazing document model |
110 | document.application.njUtils.makeElementModel(this.model.views.design.document.body, "Body", "body"); | 110 | document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body"); |
111 | //Adding observer to know when template is ready | 111 | //Adding observer to know when template is ready |
112 | this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); | 112 | this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); |
113 | this._observer.observe(this.model.views.design.document.head, {childList: true}); | 113 | this._observer.observe(this.model.views.design.document.head, {childList: true}); |
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 8e8c96d6..9da6699b 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html | |||
@@ -27,8 +27,6 @@ | |||
27 | margin: 0; | 27 | margin: 0; |
28 | padding: 0; | 28 | padding: 0; |
29 | position: absolute; | 29 | position: absolute; |
30 | -webkit-transform-style: preserve-3d; | ||
31 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
32 | } | 30 | } |
33 | 31 | ||
34 | html { | 32 | html { |
@@ -63,6 +61,9 @@ | |||
63 | top: 0; | 61 | top: 0; |
64 | left: 0; | 62 | left: 0; |
65 | background: #FFF; | 63 | background: #FFF; |
64 | -webkit-transform-style: preserve-3d; | ||
65 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
66 | |||
66 | } | 67 | } |
67 | </style> | 68 | </style> |
68 | 69 | ||