Merge branch 'refs/heads/timeline-local' into TimelineUber

1 files changed, 9 insertions, 0 deletions

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 12b6e599..80b88d4f 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -127,6 +127,12 @@
         font-size: 11px;
 }
 
+
+
+.label-layer .collapsible-label br {
+        display: none;
+}
+
 .collapsible-clicker {
         position: absolute;
         width: 10px;
@@ -219,6 +225,9 @@
     -webkit-user-select: text;
     text-overflow: clip;
 }
+.editable2 br {
+        display: inline;
+}
 
 .label-style .disabled {
         cursor: default;