From 6e9c9fd4d715567394038705e7a6ef7935e451d3 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 2 Apr 2012 17:11:30 -0700
Subject: 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."

---
 js/panels/Timeline/Layer.reel/css/Layer.css | 50 +++++++++++++++++------------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/css')

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;
 }
-- 
cgit v1.2.3


From 969137ba4520103348a496ac9b99063dc4ec8f96 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 5 Apr 2012 10:38:57 -0700
Subject: Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops
 working"

---
 js/panels/Timeline/Layer.reel/css/Layer.css | 47 +++++++++++++++--------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/css')

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


From d07b97043b69335136a5946ef161d721c95d1ce9 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 5 Apr 2012 11:22:42 -0700
Subject: Timeline: Bug fix: IKNINJA-1435

---
 js/panels/Timeline/Layer.reel/css/Layer.css | 43 +++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 9 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/css')

diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 2ea1e0f6..50e664c4 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -227,32 +227,57 @@
 }
 
 /* line 197, ../scss/Layer.scss */
+.collapsible-content .collapsible-content .layout-table .layout-row {
+  height: 20px;
+  overflow: hidden;
+}
+
+/* line 201, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell {
   width: 40%;
   height: 20px;
   border-bottom: 1px solid #505050;
   line-height: 20px;
   text-align: left;
+  overflow: hidden;
+}
+
+/* line 210, ../scss/Layer.scss */
+.collapsible-content .collapsible-content .container-row {
+  border-bottom: 1px solid #505050;
+  height: 20px;
+}
+
+/* line 216, ../scss/Layer.scss */
+.collapsible-content .collapsible-content .cell-property,
+.collapsible-content .collapsible-content .cell-value {
+  width: 45%;
+  float: left;
+  height: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  line-height: 18px;
 }
 
-/* line 204, ../scss/Layer.scss */
+/* line 228, ../scss/Layer.scss */
 .collapsible-content .layout-table:first-child {
   border-top: 1px solid #505050;
 }
 
-/* line 208, ../scss/Layer.scss */
+/* line 232, ../scss/Layer.scss */
 .collapsible-content .hottextunit {
   width: auto;
 }
 
-/* line 211, ../scss/Layer.scss */
+/* line 235, ../scss/Layer.scss */
 .collapsible-transition {
   -webkit-transition-property: height;
   -webkit-transition-duration: 200ms;
   -webkit-transition-timing-function: ease-in;
 }
 
-/* line 219, ../scss/Layer.scss */
+/* line 243, ../scss/Layer.scss */
 .editable2 {
   height: 20px;
   background-color: #242424 !important;
@@ -264,29 +289,29 @@
   text-overflow: clip;
 }
 
-/* line 229, ../scss/Layer.scss */
+/* line 253, ../scss/Layer.scss */
 .editable2 br {
   display: inline;
 }
 
-/* line 233, ../scss/Layer.scss */
+/* line 257, ../scss/Layer.scss */
 .label-style .disabled {
   cursor: default;
 }
 
 /* styles elements */
-/* line 238, ../scss/Layer.scss */
+/* line 262, ../scss/Layer.scss */
 .content-style .item-template {
   display: none;
 }
 
-/* line 241, ../scss/Layer.scss */
+/* line 265, ../scss/Layer.scss */
 .content-style .layout-row.selected .layout-cell {
   background-color: #b2b2b2;
   color: #242424;
 }
 
-/* line 245, ../scss/Layer.scss */
+/* line 269, ../scss/Layer.scss */
 .style-row {
   height: 20px;
 }
-- 
cgit v1.2.3


From 4c492e2f9d01a699aba8ccdd1a2b04238749ea3c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 10 Apr 2012 14:49:20 -0700
Subject: Timeline: New Features: Tag name now present in each layer.
 Configuration dropdown in Master Layer; Show Only Animated Layers toggle.

---
 js/panels/Timeline/Layer.reel/css/Layer.css | 73 ++++++++++++++++-------------
 1 file changed, 40 insertions(+), 33 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/css')

diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 50e664c4..179571af 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -93,36 +93,42 @@
 /* line 91, ../scss/Layer.scss */
 .userlayers .collapsible-label {
   display: block;
-  width: 100px;
   height: 21px;
   line-height: 20px;
   color: white;
-  margin-left: 30px;
-  margin-right: 20px;
+  margin-left: 80px;
+  margin-right: 40px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 /* line 103, ../scss/Layer.scss */
+.userlayers .layer-tag {
+  position: absolute;
+  top: 3px;
+  left: 20px;
+}
+
+/* line 110, ../scss/Layer.scss */
 .layerSelected .label-layer {
   background-color: #b2b2b2;
   color: #242424;
 }
 
-/* line 107, ../scss/Layer.scss */
+/* line 114, ../scss/Layer.scss */
 .content-layer {
   background-color: #474747;
   color: white;
 }
 
-/* line 111, ../scss/Layer.scss */
+/* line 118, ../scss/Layer.scss */
 .content-layer .collapsible-label {
   background-position: 14px 5px;
   border-width: 0px;
 }
 
-/* line 119, ../scss/Layer.scss */
+/* line 126, ../scss/Layer.scss */
 .label-layer,
 .label-position,
 .label-transform,
@@ -133,19 +139,20 @@
   cursor: pointer;
 }
 
-/* line 126, ../scss/Layer.scss */
+/* line 134, ../scss/Layer.scss */
 .content-layer .collapsible-label,
-.content-layer .collapsible-content {
+.content-layer .collapsible-content,
+.content-layer .layer-tag {
   font-size: 11px;
 }
 
-/* line 133, ../scss/Layer.scss */
+/* line 141, ../scss/Layer.scss */
 .label-layer .collapsible-label br,
 .content-style .editable br {
   display: none;
 }
 
-/* line 137, ../scss/Layer.scss */
+/* line 145, ../scss/Layer.scss */
 .collapsible-clicker {
   position: absolute;
   width: 10px;
@@ -158,23 +165,23 @@
   background-repeat: no-repeat;
 }
 
-/* line 148, ../scss/Layer.scss */
+/* line 156, ../scss/Layer.scss */
 .collapsible-clicker.collapsible-collapsed {
   background-image: url(../images/icon-collapsed.png);
 }
 
-/* line 151, ../scss/Layer.scss */
+/* line 159, ../scss/Layer.scss */
 .collapsible-content .collapsible-clicker {
   left: 12px;
 }
 
-/* line 154, ../scss/Layer.scss */
+/* line 162, ../scss/Layer.scss */
 .container-layer .collapsible-content.collapsible-collapsed {
   height: 0px;
   overflow: hidden;
 }
 
-/* line 160, ../scss/Layer.scss */
+/* line 168, ../scss/Layer.scss */
 .label-layer .cssbutton,
 .label-style .cssbutton {
   width: 14px;
@@ -184,21 +191,21 @@
   background-repeat: no-repeat;
 }
 
-/* line 167, ../scss/Layer.scss */
+/* line 175, ../scss/Layer.scss */
 .label-layer .button-lock {
   background-image: url(../images/icon-lock.png);
   top: 3px;
   right: 27px;
 }
 
-/* line 172, ../scss/Layer.scss */
+/* line 180, ../scss/Layer.scss */
 .label-layer .button-visible {
   background-image: url(../images/icon-eye.png);
   top: 3px;
   right: 7px;
 }
 
-/* line 177, ../scss/Layer.scss */
+/* line 185, ../scss/Layer.scss */
 .label-style .button-add {
   background-image: url(../images/icon-plus.png);
   width: 15px;
@@ -207,7 +214,7 @@
   right: 11px;
 }
 
-/* line 184, ../scss/Layer.scss */
+/* line 192, ../scss/Layer.scss */
 .label-style .button-delete {
   background-image: url(../images/icon-minus.png);
   width: 15px;
@@ -216,23 +223,23 @@
   right: 31px;
 }
 
-/* line 191, ../scss/Layer.scss */
+/* line 199, ../scss/Layer.scss */
 .collapsible-content .layout-table {
   width: 99.9%;
 }
 
-/* line 194, ../scss/Layer.scss */
+/* line 202, ../scss/Layer.scss */
 .content-layer .collapsible-content {
   padding-left: 30px;
 }
 
-/* line 197, ../scss/Layer.scss */
+/* line 205, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .layout-table .layout-row {
   height: 20px;
   overflow: hidden;
 }
 
-/* line 201, ../scss/Layer.scss */
+/* line 209, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell {
   width: 40%;
   height: 20px;
@@ -242,13 +249,13 @@
   overflow: hidden;
 }
 
-/* line 210, ../scss/Layer.scss */
+/* line 218, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .container-row {
   border-bottom: 1px solid #505050;
   height: 20px;
 }
 
-/* line 216, ../scss/Layer.scss */
+/* line 224, ../scss/Layer.scss */
 .collapsible-content .collapsible-content .cell-property,
 .collapsible-content .collapsible-content .cell-value {
   width: 45%;
@@ -260,24 +267,24 @@
   line-height: 18px;
 }
 
-/* line 228, ../scss/Layer.scss */
+/* line 236, ../scss/Layer.scss */
 .collapsible-content .layout-table:first-child {
   border-top: 1px solid #505050;
 }
 
-/* line 232, ../scss/Layer.scss */
+/* line 240, ../scss/Layer.scss */
 .collapsible-content .hottextunit {
   width: auto;
 }
 
-/* line 235, ../scss/Layer.scss */
+/* line 243, ../scss/Layer.scss */
 .collapsible-transition {
   -webkit-transition-property: height;
   -webkit-transition-duration: 200ms;
   -webkit-transition-timing-function: ease-in;
 }
 
-/* line 243, ../scss/Layer.scss */
+/* line 251, ../scss/Layer.scss */
 .editable2 {
   height: 20px;
   background-color: #242424 !important;
@@ -289,29 +296,29 @@
   text-overflow: clip;
 }
 
-/* line 253, ../scss/Layer.scss */
+/* line 261, ../scss/Layer.scss */
 .editable2 br {
   display: inline;
 }
 
-/* line 257, ../scss/Layer.scss */
+/* line 265, ../scss/Layer.scss */
 .label-style .disabled {
   cursor: default;
 }
 
 /* styles elements */
-/* line 262, ../scss/Layer.scss */
+/* line 270, ../scss/Layer.scss */
 .content-style .item-template {
   display: none;
 }
 
-/* line 265, ../scss/Layer.scss */
+/* line 273, ../scss/Layer.scss */
 .content-style .layout-row.selected .layout-cell {
   background-color: #b2b2b2;
   color: #242424;
 }
 
-/* line 269, ../scss/Layer.scss */
+/* line 277, ../scss/Layer.scss */
 .style-row {
   height: 20px;
 }
-- 
cgit v1.2.3