Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/js/panels/css-panel/rule-list.reel/rule-list.css b/js/panels/css-panel/rule-list.reel/rule-list.css
new file mode 100644
index 00000000..2aba01da
--- /dev/null
+++ b/js/panels/css-panel/rule-list.reel/rule-list.css
@@ -0,0 +1,30 @@
+/* <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> */
+.rule-list-container {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-flex: 1;
+}
+.rule-list {
+    background-color: #FFF;
+    background: #FFF -webkit-linear-gradient(top, rgba(0,0,0,0.12) 0%,rgba(0,0,0,0) 4px);
+    color: #333;
+    display: block;
+    font-family: monospace;
+    padding: 0;
+    margin: 0;
+    overflow-y: auto;
+    -webkit-box-orient: vertical;
+    -webkit-box-flex: 1;
+}
+.rule-list li {
+    list-style-type: none;
+    margin: 0;
+}
+
+.hidden-rule-list {
+    display: none;
+}
\ No newline at end of file