Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 37 insertions, 0 deletions

diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
new file mode 100755
index 00000000..ce7072c7
--- /dev/null
+++ b/js/stage/stage-view.reel/stage-view.css
@@ -0,0 +1,37 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+.codeViewContainer {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #ffffff;
+  width: 100%;
+  height: 100%;
+  overflow:auto;
+  /*display: none;*/
+}
+
+/* OLD CSS for reference
+#mainContent #codeMirror_1 {
+    height:100%;
+}
+*/
+
+.CodeMirror {
+    width: 100%;
+    height: 100%;
+    background: white;
+}
+
+.CodeMirror .CodeMirror-scroll {
+    height: 100%;
+    overflow: scroll;
+    overflow-x: auto;
+    overflow-y: auto;
+}