Merge branch 'pentool' into brushtool

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

1 files changed, 68 insertions, 0 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
new file mode 100755
index 00000000..e79082a6
--- /dev/null
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
@@ -0,0 +1,68 @@
+/* <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> */
+
+.newfileLocation .newFileName{
+    width:65%;
+    margin-left:5px;
+    text-shadow: 1px 1px 1px #000;
+}
+
+.newfileLocation .newFileDirectory{
+    width:70%;
+    margin-left:5px;
+    text-shadow: 1px 1px 1px #000;
+}
+
+.newfileLocation .templateSelection{
+    float:left;
+    width:20%;
+    height:90%;
+    padding-right: 10px;
+}
+
+.newfileLocation .templateSelection .template{
+    width:80%;
+    height:60%;
+    background-color: #e1e1e1;
+    border:1px solid #000000;
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);
+}
+
+.newfileLocation .locationSelection{
+    float:left;
+    width:75%;
+    text-shadow: 1px 1px 1px #000;
+}
+
+.newfileLocation .locationSelection div{
+    padding-bottom: 5px;
+}
+
+.newfileLocation .locationSelection input{
+    margin-left: 5px;
+    white-space: nowrap;
+    text-shadow: 1px 1px 1px #333;
+}
+
+.newfileLocation .templatePx{
+    padding-left: 5px;
+    white-space: nowrap;
+}
+
+.newfileLocation .nameText{
+    margin-right:28px;
+    text-shadow: 1px 1px 1px #000;
+}
+
+.newfileLocation .hottextunit{
+    float: none;
+    display: inline;
+}
+
+.newfileLocation .fileExtension{
+    color:#FFF;
+    text-shadow: 1px 1px 1px #000;
+}