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/scss/Layer.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

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

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;
-- 
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/scss/Layer.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 80b88d4f..df3f93d5 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -129,7 +129,8 @@
 
 
 
-.label-layer .collapsible-label br {
+.label-layer .collapsible-label br,
+.content-style .editable br {
 	display: none;
 }
 
-- 
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/scss/Layer.scss | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index df3f93d5..391bae38 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -194,13 +194,37 @@
 .content-layer .collapsible-content {
 	padding-left: 30px;
 }
+.collapsible-content .collapsible-content .layout-table .layout-row {
+	height: 20px;
+	overflow: hidden;
+}
 .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell {
 	width: 40%;
 	height: 20px;
 	border-bottom: 1px solid $color-menu-divider;
 	line-height: 20px;
 	text-align: left;
+	overflow: hidden;
+}
+
+.collapsible-content .collapsible-content .container-row {
+	border-bottom: 1px solid $color-menu-divider;
+	height: 20px;
 }
+
+.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;
+}
+
+
+
 .collapsible-content .layout-table:first-child {
 	border-top: 1px solid $color-menu-divider;
 }
-- 
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/scss/Layer.scss | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 391bae38..8e5e50db 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -90,16 +90,23 @@
 
 .userlayers .collapsible-label {
 	display: block;
-	width: 100px;
     height: 21px;
     line-height: 20px;
 	color: $color-panel-text;
-	margin-left: 30px;
-	margin-right: 20px;
+	margin-left: 80px;
+	margin-right: 40px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+
+.userlayers .layer-tag {
+	position: absolute;
+	top: 3px;
+	left: 20px;
+}
+
+
 .layerSelected .label-layer {
 	background-color: $color-panel-hilite-bg;
 	color: $color-panel-hilite-text;
@@ -123,7 +130,8 @@
 }
 
 .content-layer .collapsible-label,
-.content-layer .collapsible-content {
+.content-layer .collapsible-content,
+.content-layer .layer-tag {
 	font-size: 11px;
 }
 
-- 
cgit v1.2.3