aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss/Layer.scss
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:31 -0800
committerJose Antonio Marquez2012-02-28 13:33:31 -0800
commit3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree657d55ad394de168dd627cf89b875906d10584e2 /js/panels/Timeline/Layer.reel/scss/Layer.scss
parentd764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss/Layer.scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss29
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 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7 </copyright> */
8
3/* Layer.scss 9/* Layer.scss
4 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 10 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
5 */ 11 */
6 12
7// Import theme settings 13// Import theme settings
8@import "../../../../../_scss/imports/themes/default/colors"; 14@import "../../../../../scss/imports/themes/default/colors";
9// @import "../../../../../_scss/imports/themes/default/fonts"; 15// @import "../../../../../scss/imports/themes/default/fonts";
10@import "../../../../../_scss/imports/themes/default/mixins"; 16@import "../../../../../scss/imports/themes/default/mixins";
11 17
12// Import generic mixins and styles 18// Import generic mixins and styles
13@import "../../../../../_scss/imports/scss/mixins"; 19@import "../../../../../scss/imports/scss/mixins";
14// @import "../../../../../_scss/imports/scss/Base"; 20// @import "../../../../../scss/imports/scss/Base";
15 21
16.layerLabel{ 22.layerLabel{
17 width: 100%; 23 width: 100%;
@@ -109,7 +115,8 @@
109.label-layer, 115.label-layer,
110.label-position, 116.label-position,
111.label-transform, 117.label-transform,
112.label-style { 118.label-style,
119.label-styles {
113 position: relative; 120 position: relative;
114 border-bottom: 1px solid #505050; 121 border-bottom: 1px solid #505050;
115 cursor: pointer; 122 cursor: pointer;
@@ -190,12 +197,18 @@
190.collapsible-content .layout-table:first-child { 197.collapsible-content .layout-table:first-child {
191 border-top: 1px solid $color-menu-divider; 198 border-top: 1px solid $color-menu-divider;
192} 199}
200
201.collapsible-content .hottextunit {
202 width: auto;
203}
193.collapsible-transition { 204.collapsible-transition {
194 -webkit-transition-property: height; 205 -webkit-transition-property: height;
195 -webkit-transition-duration: 200ms; 206 -webkit-transition-duration: 200ms;
196 -webkit-transition-timing-function: ease-in; 207 -webkit-transition-timing-function: ease-in;
197} 208}
198 209
210
211
199.editable2 { 212.editable2 {
200 height: 20px; 213 height: 20px;
201 background-color: $color-panel-hilite-text !IMPORTANT; 214 background-color: $color-panel-hilite-text !IMPORTANT;
@@ -207,6 +220,10 @@
207 text-overflow: clip; 220 text-overflow: clip;
208} 221}
209 222
223.label-style .disabled {
224 cursor: default;
225}
226
210/* styles elements */ 227/* styles elements */
211.content-style .item-template { 228.content-style .item-template {
212 display: none; 229 display: none;