Merge branch 'master' into pentool

1 files changed, 13 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index c122b18f..129b9771 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -15,6 +15,7 @@
     display: -webkit-box;
     -webkit-box-orient: horizontal
     height : 100%;
+    position: relative;
 }
 .leftinside{
     height: 100%;
@@ -271,4 +272,15 @@
     font-size: 12px;
     text-shadow: 1px 1px 1px black;
     color: white;
-}
\ No newline at end of file
+}
+.timeline-disabled {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(30,30,30, 0.796);
+        z-index: 100;
+        display: none;
+        box-shadow: rgb(17, 17, 17) 0px 0px 14px inset;
+}