Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/document/html-document.js

1 files changed, 41 insertions, 0 deletions

diff --git a/node_modules/ninja-components/hottextunit.reel/hottextunit.css b/node_modules/ninja-components/hottextunit.reel/hottextunit.css
new file mode 100644
index 00000000..9476415c
--- /dev/null
+++ b/node_modules/ninja-components/hottextunit.reel/hottextunit.css
@@ -0,0 +1,41 @@
+/* <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> */
+
+.hottextunit
+{
+    -webkit-user-select:none;
+    cursor:default;
+    width:50px;
+    float:left;
+}
+
+.hottextunit:hover
+{
+    cursor: pointer;
+}
+
+.hottextunit input
+{
+    width:50px;
+    border:none;
+    padding:0;
+    margin:0;
+}
+
+.underline
+{
+    border-bottom:1px dotted white;
+}
+
+.hide
+{
+    display:none;
+}
+
+.disabled
+{
+    color:#999999;
+}
\ No newline at end of file