Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html

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

1 files changed, 16 insertions, 4 deletions

diff --git a/node_modules/montage/ui/popup/popup.reel/popup.css b/node_modules/montage/ui/popup/popup.reel/popup.css
index 4597d8ac..6260b8a9 100755
--- a/node_modules/montage/ui/popup/popup.reel/popup.css
+++ b/node_modules/montage/ui/popup/popup.reel/popup.css
@@ -34,10 +34,22 @@
 }
 
 .montage-popup-container {
-    background-color: #fff;
-    border-radius: 5px;
-    border: 3px solid #000;
-
+    border: 1px solid #eee;
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    -webkit-transition: opacity .25s;
+    -moz-transition: opacity .25s;
+    -ms-transition: opacity .25s;
+    -o-transition: opacity .25s;
+    transition: opacity .25s;
+    background: white;
+    border: 1px solid rgba(0, 0, 0, .2);
+    cursor: default;
+    margin: 0;
+    outline: none;
+    width: auto;
+    border-radius: 3px;
 }
 
 .montage-popup-noborder {