Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with one

layer in focus whose name is empty, Ninja creates an empty name layer for
the element."

1 files changed, 30 insertions, 20 deletions

diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 8e36c2db..1aae8d67 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -139,7 +139,12 @@
   font-size: 11px;
 }
 
-/* line 130, ../scss/Layer.scss */
+/* line 132, ../scss/Layer.scss */
+.label-layer .collapsible-label br {
+  display: none;
+}
+
+/* line 136, ../scss/Layer.scss */
 .collapsible-clicker {
   position: absolute;
   width: 10px;
@@ -152,23 +157,23 @@
   background-repeat: no-repeat;
 }
 
-/* line 141, ../scss/Layer.scss */
+/* line 147, ../scss/Layer.scss */
 .collapsible-clicker.collapsible-collapsed {
   background-image: url(../images/icon-collapsed.png);
 }
 
-/* line 144, ../scss/Layer.scss */
+/* line 150, ../scss/Layer.scss */
 .collapsible-content .collapsible-clicker {
   left: 12px;
 }
 
-/* line 147, ../scss/Layer.scss */
+/* line 153, ../scss/Layer.scss */
 .container-layer .collapsible-content.collapsible-collapsed {
   height: 0px;
   overflow: hidden;
 }
 
-/* line 153, ../scss/Layer.scss */
+/* line 159, ../scss/Layer.scss */
 .label-layer .cssbutton,
 .label-style .cssbutton {
   width: 14px;
@@ -178,21 +183,21 @@
   background-repeat: no-repeat;
 }
 
-/* line 160, ../scss/Layer.scss */
+/* line 166, ../scss/Layer.scss */
 .label-layer .button-lock {
   background-image: url(../images/icon-lock.png);
   top: 3px;
   right: 27px;
 }
 
-/* line 165, ../scss/Layer.scss */
+/* line 171, ../scss/Layer.scss */
 .label-layer .button-visible {
   background-image: url(../images/icon-eye.png);
   top: 3px;
   right: 7px;
 }
 
-/* line 170, ../scss/Layer.scss */
+/* line 176, ../scss/Layer.scss */
 .label-style .button-add {
   background-image: url(../images/icon-plus.png);
   width: 15px;
@@ -201,7 +206,7 @@
   right: 11px;
 }
 
-/* line 177, ../scss/Layer.scss */
+/* line 183, ../scss/Layer.scss */
 .label-style .button-delete {
   background-image: url(../images/icon-minus.png);
   width: 15px;
@@ -210,17 +215,17 @@
   right: 31px;
 }
 
-/* line 184, ../scss/Layer.scss */
+/* line 190, ../scss/Layer.scss */
 .collapsible-content .layout-table {
   width: 99.9%;
 }
 
-/* line 187, ../scss/Layer.scss */
+/* line 193, ../scss/Layer.scss */
 .content-layer .collapsible-content {
   padding-left: 30px;
 }
 
-/* line 190, ../scss/Layer.scss */
+/* line 196, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell {
   width: 40%;
   height: 20px;
@@ -229,24 +234,24 @@
   text-align: left;
 }
 
-/* line 197, ../scss/Layer.scss */
+/* line 203, ../scss/Layer.scss */
 .collapsible-content .layout-table:first-child {
   border-top: 1px solid #505050;
 }
 
-/* line 201, ../scss/Layer.scss */
+/* line 207, ../scss/Layer.scss */
 .collapsible-content .hottextunit {
   width: auto;
 }
 
-/* line 204, ../scss/Layer.scss */
+/* line 210, ../scss/Layer.scss */
 .collapsible-transition {
   -webkit-transition-property: height;
   -webkit-transition-duration: 200ms;
   -webkit-transition-timing-function: ease-in;
 }
 
-/* line 212, ../scss/Layer.scss */
+/* line 218, ../scss/Layer.scss */
 .editable2 {
   height: 20px;
   background-color: #242424 !important;
@@ -258,24 +263,29 @@
   text-overflow: clip;
 }
 
-/* line 223, ../scss/Layer.scss */
+/* line 228, ../scss/Layer.scss */
+.editable2 br {
+  display: inline;
+}
+
+/* line 232, ../scss/Layer.scss */
 .label-style .disabled {
   cursor: default;
 }
 
 /* styles elements */
-/* line 228, ../scss/Layer.scss */
+/* line 237, ../scss/Layer.scss */
 .content-style .item-template {
   display: none;
 }
 
-/* line 231, ../scss/Layer.scss */
+/* line 240, ../scss/Layer.scss */
 .content-style .layout-row.selected .layout-cell {
   background-color: #b2b2b2;
   color: #242424;
 }
 
-/* line 235, ../scss/Layer.scss */
+/* line 244, ../scss/Layer.scss */
 .style-row {
   height: 20px;
 }