aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 16:03:55 -0800
committerJose Antonio Marquez2012-02-16 16:03:55 -0800
commitb1d169d2dc941c7d2f51f0c557b7bf6488457742 (patch)
treebad9b38e54ffe10de514d26539fafd7ce005d1fb
parent6bc07657c8ef58e6efddd383748ecf84d1c789ad (diff)
parentbe0318ed92d1fbc853568648f773322401d9c029 (diff)
downloadninja-b1d169d2dc941c7d2f51f0c557b7bf6488457742.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
-rw-r--r--.gitignore7
-rwxr-xr-xcss/ninja.css4
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js2
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js8
-rwxr-xr-xscss/imports/scss/_MainWindow.scss10
-rw-r--r--scss/imports/scss/_Stage.scss13
6 files changed, 26 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index 6c288e8c..40248468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
8.DS_Store 8.DS_Store
9.project 9.project
10 10
11_scss/compass_app_log.txt
12_scss/.sass-cache
13
14js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc 11js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
15js/panels/Color/colorpanelpopup.reel/compass_app_log.txt 12js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
16js/panels/Color/colorpanelbase.reel/compass_app_log.txt 13js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
21cloud/ 18cloud/
22 19
23/.idea/scopes/scope_settings.xml 20/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss
25compass_app_log.txt 21compass_app_log.txt
26js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file 22js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
23scss/.sass-cache/ \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index 824a675a..96ae6caf 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
118 118
119#sceneBar { height: 70px; background-color: #474747; } 119#sceneBar { height: 70px; background-color: #474747; }
120 120
121#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;} 121#mainContainer #rulerTop { background: gray; height: 15px; margin-bottom: 0px; }
122 122
123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;} 123#rulerLeft { background: gray; width: 16px; }
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 62f7e522..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -90,7 +90,7 @@ exports.CloudPopup = Montage.create(Component, {
90 value: function() { 90 value: function() {
91 if(this._os === 'mac') { 91 if(this._os === 'mac') {
92 location.href = '/ninja_localcloud_for_mac.zip'; 92 location.href = '/ninja_localcloud_for_mac.zip';
93 } else if (this._os === 'win') { 93 } else if (this._os === 'windows') {
94 location.href = '/ninja_localcloud_for_windows.zip'; 94 location.href = '/ninja_localcloud_for_windows.zip';
95 } else { 95 } else {
96 alert('Your operating system is not supported by the Ninja Local Cloud App.'); 96 alert('Your operating system is not supported by the Ninja Local Cloud App.');
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index cd19f361..46d74e13 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -198,14 +198,14 @@ exports.StageView = Montage.create(Component, {
198 }, 198 },
199 showRulers:{ 199 showRulers:{
200 value:function(){ 200 value:function(){
201 this.application.ninja.rulerTop.style.display = "block"; 201 this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')";
202 this.application.ninja.rulerLeft.style.display = "block"; 202 this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')";
203 } 203 }
204 }, 204 },
205 hideRulers:{ 205 hideRulers:{
206 value:function(){ 206 value:function(){
207 this.application.ninja.rulerTop.style.display = "none"; 207 this.application.ninja.rulerTop.style.background = "rgb(128,128,128)";
208 this.application.ninja.rulerLeft.style.display = "none"; 208 this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)";
209 } 209 }
210 }, 210 },
211 211
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 0b0649dc..97344b1e 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -200,18 +200,16 @@
200} 200}
201 201
202#mainContainer #rulerTop { 202#mainContainer #rulerTop {
203 // TODO: temporary background please replace when component is implemented 203 // TODO: temporary background please replace when component is implemented
204 background: url("../images/temp/ruler-top.png"); 204 background:$color-stage;
205 height:15px; 205 height:15px;
206 margin-bottom: 0px; 206 margin-bottom: 0px;
207 display:none;
208} 207}
209 208
210#rulerLeft { 209#rulerLeft {
211 // TODO: temporary background please replace when component is implemented 210 // TODO: temporary background please replace when component is implemented
212 background: url("../images/temp/ruler-left.png"); 211 background:$color-stage;
213 width:16px; 212 width:16px;
214 display:none;
215} 213}
216 214
217#stateBar { 215#stateBar {
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 7b7db576..587903d2 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,3 +192,16 @@
192 overflow-x: auto; 192 overflow-x: auto;
193 overflow-y: auto; 193 overflow-y: auto;
194} 194}
195
196.montage-editor-frame {
197 position:absolute;
198 z-index:7;
199 top: 0;
200 left:0;
201 display:none;
202 -webkit-user-select: initial;
203}
204.montage-editor {
205 padding:0px;
206 word-wrap: normal;
207} \ No newline at end of file