Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/document/html-document.js

1 files changed, 27 insertions, 0 deletions

diff --git a/node_modules/ninja-components/hottext.reel/hottext.css b/node_modules/ninja-components/hottext.reel/hottext.css
new file mode 100644
index 00000000..34b353f4
--- /dev/null
+++ b/node_modules/ninja-components/hottext.reel/hottext.css
@@ -0,0 +1,27 @@
+/* <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> */
+
+.hottext {
+    cursor: default;
+    border:none;
+    border-bottom:1px dotted white;
+    width:50px;
+    text-align:center;
+    -webkit-user-select:none;
+    outline:none;
+}
+
+.hottext:hover
+{
+    cursor: pointer;
+}
+
+.hottextInput
+{
+    cursor: default;
+    width:50px;
+    text-align:center;
+}
\ No newline at end of file