diff options
author | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
commit | 34804fa77191a08fcdaa8ca1992b38e60094f3ae (patch) | |
tree | 9eafadc20bb792b4058572ff1e12440428fe7c74 /js/components/layout | |
parent | a9ff54e7490761a7c0ad572d060ee386179d11df (diff) | |
parent | c88752d621069b12f978c1fd88ffdd52537a4657 (diff) | |
download | ninja-34804fa77191a08fcdaa8ca1992b38e60094f3ae.tar.gz |
Merge branch 'refs/heads/v0.7.2'
Diffstat (limited to 'js/components/layout')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.css | 2 | ||||
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css index 5eba72e8..2c547a22 100755 --- a/js/components/layout/document-bar.reel/document-bar.css +++ b/js/components/layout/document-bar.reel/document-bar.css | |||
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
33 | background: -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(60, 60, 60)), color-stop(70%, rgb(30, 30, 30)), color-stop(100%, rgb(25, 25, 25))), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(10, 10, 10)), color-stop(50%, rgb(20, 20, 20)), color-stop(100%, rgb(10, 10, 10))) !important; | 33 | background: -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(60, 60, 60)), color-stop(70%, rgb(30, 30, 30)), color-stop(100%, rgb(25, 25, 25))), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(10, 10, 10)), color-stop(50%, rgb(20, 20, 20)), color-stop(100%, rgb(10, 10, 10))) !important; |
34 | background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat !important; | 34 | background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat !important; |
35 | background-position: 49.5% center, 50.5% center, center center, left top !important; | 35 | background-position: 49.5% center, 50.5% center, center center, left top !important; |
36 | background-size: 5px 5px, 5px 5px, 3% 100%, 100% 100%; | 36 | background-size: 5px 5px, 5px 5px, 3% 100%, 100% 100% !important; |
37 | } | 37 | } |
38 | 38 | ||
39 | .documentBar { | 39 | .documentBar { |
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 098e9e68..88c4a24b 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js | |||
@@ -246,7 +246,7 @@ exports.DocumentBar = Montage.create(Component, { | |||
246 | file: this._currentDocument.model.file, | 246 | file: this._currentDocument.model.file, |
247 | webgl: this._currentDocument.model.webGlHelper.glData, | 247 | webgl: this._currentDocument.model.webGlHelper.glData, |
248 | styles: this._currentDocument.model.getStyleSheets(), | 248 | styles: this._currentDocument.model.getStyleSheets(), |
249 | template: this._currentDocument.fileTemplate, | 249 | template: this._currentDocument.model.fileTemplate, |
250 | document: this._currentDocument.model.views.design.iframe.contentWindow.document, | 250 | document: this._currentDocument.model.views.design.iframe.contentWindow.document, |
251 | head: this._currentDocument.model.views.design.iframe.contentWindow.document.head, | 251 | head: this._currentDocument.model.views.design.iframe.contentWindow.document.head, |
252 | body: this._currentDocument.model.views.design.iframe.contentWindow.document.body, | 252 | body: this._currentDocument.model.views.design.iframe.contentWindow.document.body, |
@@ -256,7 +256,7 @@ exports.DocumentBar = Montage.create(Component, { | |||
256 | doc = this._currentDocument.model.views.code.textArea.value; | 256 | doc = this._currentDocument.model.views.code.textArea.value; |
257 | } | 257 | } |
258 | //Reloading the document from changes made | 258 | //Reloading the document from changes made |
259 | this._currentDocument.reloadView(view, this.fileTemplate, doc); | 259 | this._currentDocument.reloadView(view, doc.template, doc); |
260 | } | 260 | } |
261 | } | 261 | } |
262 | }, | 262 | }, |