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')

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