Merge branch 'refs/heads/NinjaInternal' into Color

1 files changed, 23 insertions, 6 deletions

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 7473a275..1e574cc0 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,17 +1,23 @@
 @charset "UTF-8";
 
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 /* Layer.scss
  * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
  */
  
 // Import theme settings
-@import "../../../../../_scss/imports/themes/default/colors";
-// @import "../../../../../_scss/imports/themes/default/fonts";
-@import "../../../../../_scss/imports/themes/default/mixins";
+@import "../../../../../scss/imports/themes/default/colors";
+// @import "../../../../../scss/imports/themes/default/fonts";
+@import "../../../../../scss/imports/themes/default/mixins";
 
 // Import generic mixins and styles
-@import "../../../../../_scss/imports/scss/mixins";
-// @import "../../../../../_scss/imports/scss/Base";
+@import "../../../../../scss/imports/scss/mixins";
+// @import "../../../../../scss/imports/scss/Base";
 
 .layerLabel{
     width: 100%;
@@ -109,7 +115,8 @@
 .label-layer,
 .label-position,
 .label-transform,
-.label-style {
+.label-style,
+.label-styles {
         position: relative;
         border-bottom: 1px solid #505050;
         cursor: pointer;
@@ -190,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;
@@ -207,6 +220,10 @@
     text-overflow: clip;
 }
 
+.label-style .disabled {
+        cursor: default;
+}
+
 /* styles elements */
 .content-style .item-template {
         display: none;