Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool

Conflicts:
	_scss/compass_app_log.txt
	css/ninja.css

1 files changed, 40 insertions, 0 deletions

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
new file mode 100644
index 00000000..6a458cc7
--- /dev/null
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -0,0 +1,40 @@
+/* <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> */
+
+.treeRoot > .branch > ul {
+    margin-top: 0;
+}
+.branch ul {
+    list-style: none;
+    padding-left: 0;
+}
+.branch .nj-collapser {
+    -webkit-transition: height 0.14s cubic-bezier(.44,.19,0,.99);
+}
+.branch .branchCollapser ul {
+    width: 100%;
+}
+.treeRoot .branch .branch-label {
+    border-bottom: 1px solid #505050;
+    cursor: pointer;
+    padding: 3px 0 4px;
+    background-repeat: no-repeat;
+    background-position: 3px 2px;
+    box-shadow: 0 0 0 0 rgba(0,0,0,0);
+    font-weight: bold;
+    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
+}
+
+/* First Level */
+.branch .branch .branch-label {
+    padding-left: 25px;
+}
+
+/* Second Level */
+.branch .branch .branch .branch-label {
+    padding-left: 45px;
+    background-position: 25px;
+}
\ No newline at end of file