Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 6 insertions, 0 deletions

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index dda0c951..1e574cc0 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -197,12 +197,18 @@
 .collapsible-content .layout-table:first-child {
         border-top: 1px solid $color-menu-divider;
 }
+
+.collapsible-content .hottextunit {
+        width: auto;
+}
 .collapsible-transition {
         -webkit-transition-property: height;
         -webkit-transition-duration: 200ms;
         -webkit-transition-timing-function: ease-in;
 }
 
+
+
 .editable2 {
         height: 20px;
         background-color: $color-panel-hilite-text !IMPORTANT;