diff options
-rw-r--r-- | js/panels/CSSPanel/CSSPanel.js | 6 | ||||
-rw-r--r-- | js/stage/stage.reel/stage.js | 7 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 14 |
3 files changed, 3 insertions, 24 deletions
diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js index cf8880a3..94860b30 100644 --- a/js/panels/CSSPanel/CSSPanel.js +++ b/js/panels/CSSPanel/CSSPanel.js | |||
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, { | |||
20 | init : { | 20 | init : { |
21 | enumerable:true, | 21 | enumerable:true, |
22 | value : function (){ | 22 | value : function (){ |
23 | this.minHeight = 195; | 23 | this.minHeight = 300; |
24 | this.contentHeight = 195; | 24 | this.contentHeight = 300; |
25 | this.defaultHeight= 195; | 25 | this.defaultHeight= 300; |
26 | 26 | ||
27 | /* OLD WAY -- Removing the temporary div | 27 | /* OLD WAY -- Removing the temporary div |
28 | // TODO: Remove this comment once this is tested. | 28 | // TODO: Remove this comment once this is tested. |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 6d9a7355..9e2df5a2 100644 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -12,7 +12,6 @@ var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | |||
12 | 12 | ||
13 | exports.Stage = Montage.create(Component, { | 13 | exports.Stage = Montage.create(Component, { |
14 | 14 | ||
15 | textTool: { value: null }, | ||
16 | // TODO - Need to figure out how to remove this dependency | 15 | // TODO - Need to figure out how to remove this dependency |
17 | // Needed by some tools that depend on selectionDrawn event to set up some logic | 16 | // Needed by some tools that depend on selectionDrawn event to set up some logic |
18 | drawNow: { value : false }, | 17 | drawNow: { value : false }, |
@@ -781,12 +780,6 @@ exports.Stage = Montage.create(Component, { | |||
781 | } | 780 | } |
782 | }, | 781 | }, |
783 | 782 | ||
784 | toViewportCoordinates: { | ||
785 | value: function(x,y) { | ||
786 | return [x + this._userContentLeft, y + this._userContentTop]; | ||
787 | } | ||
788 | }, | ||
789 | |||
790 | setZoom: { | 783 | setZoom: { |
791 | value: function(value) { | 784 | value: function(value) { |
792 | if(!this._firstDraw) | 785 | if(!this._firstDraw) |
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index e77be724..7b7db576 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
@@ -192,17 +192,3 @@ | |||
192 | overflow-x: auto; | 192 | overflow-x: auto; |
193 | overflow-y: auto; | 193 | overflow-y: auto; |
194 | } | 194 | } |
195 | .montage-editor-frame { | ||
196 | position:absolute; | ||
197 | z-index:7; | ||
198 | top: 0; | ||
199 | left:0; | ||
200 | display:none; | ||
201 | -webkit-user-select: initial; | ||
202 | } | ||
203 | .montage-editor { | ||
204 | padding:0px; | ||
205 | word-wrap: normal; | ||
206 | |||
207 | |||
208 | } | ||