aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorhwc4872012-02-23 15:21:56 -0800
committerhwc4872012-02-23 15:21:56 -0800
commit26bb2894c29d4608e843de01829d352dd3d00823 (patch)
treec5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/Layer.reel/scss
parent64280907f31e6f6e5659acb0893df3e0da5bb044 (diff)
parent81ce79819ba574b03b46e91e9a153dab82b550cd (diff)
downloadninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss17
1 files changed, 11 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..c66a6267 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -5,13 +5,13 @@
5 */ 5 */
6 6
7// Import theme settings 7// Import theme settings
8@import "../../../../../_scss/imports/themes/default/colors"; 8@import "../../../../../scss/imports/themes/default/colors";
9// @import "../../../../../_scss/imports/themes/default/fonts"; 9// @import "../../../../../scss/imports/themes/default/fonts";
10@import "../../../../../_scss/imports/themes/default/mixins"; 10@import "../../../../../scss/imports/themes/default/mixins";
11 11
12// Import generic mixins and styles 12// Import generic mixins and styles
13@import "../../../../../_scss/imports/scss/mixins"; 13@import "../../../../../scss/imports/scss/mixins";
14// @import "../../../../../_scss/imports/scss/Base"; 14// @import "../../../../../scss/imports/scss/Base";
15 15
16.layerLabel{ 16.layerLabel{
17 width: 100%; 17 width: 100%;
@@ -109,7 +109,8 @@
109.label-layer, 109.label-layer,
110.label-position, 110.label-position,
111.label-transform, 111.label-transform,
112.label-style { 112.label-style,
113.label-styles {
113 position: relative; 114 position: relative;
114 border-bottom: 1px solid #505050; 115 border-bottom: 1px solid #505050;
115 cursor: pointer; 116 cursor: pointer;
@@ -207,6 +208,10 @@
207 text-overflow: clip; 208 text-overflow: clip;
208} 209}
209 210
211.label-style .disabled {
212 cursor: default;
213}
214
210/* styles elements */ 215/* styles elements */
211.content-style .item-template { 216.content-style .item-template {
212 display: none; 217 display: none;