Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 41 insertions, 0 deletions

diff --git a/js/stage/objects-tray.reel/objects-tray.css b/js/stage/objects-tray.reel/objects-tray.css
new file mode 100644
index 00000000..61d9ff1e
--- /dev/null
+++ b/js/stage/objects-tray.reel/objects-tray.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> */
+
+/*
+
+<section data-montage-id="objects-panel" class="objects-panel">
+    <ul data-montage-id="list" class="objects-list">
+        <li data-montage-id="list-item" class="list-item"></li>
+    </ul>
+</section>
+
+*/
+
+.objects-list {
+    font-size: 11px;
+    margin: 10px 0 0 0;
+    padding: 0;
+    text-shadow: -1px -1px 0 #4D4D4D;
+}
+
+.objects-tray {
+    background-color: rgba(0,0,0,.6);
+    border-top-right-radius: 8px;
+    border-top-left-radius: 8px;
+    box-shadow: inset 0 0 3px #333;
+    padding: 0 10px 5px;
+    margin: 0 auto;
+    overflow: hidden;
+    -webkit-box-flex: 0;
+    -webkit-transition: -webkit-transform .5s cubic-bezier(.44,.19,0,.99);
+    -webkit-transform-origin: center bottom;
+
+}
+
+.hide-objects-tray {
+    /*-webkit-transform: scale(0);*/
+    -webkit-transform: translate3d(0, 100px, 0) scale(.5);
+}
\ No newline at end of file