diff options
author | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 13:42:03 -0800 |
commit | 1144007ba899e87de73a372b45262f41f8e3e450 (patch) | |
tree | db1e0789c5918076ebae180f48c06d33f2562d98 /js/panels/Timeline/Layer.reel/scss | |
parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
parent | a8c153cc4f6a4f4f3367b0b2a763fa86b442c201 (diff) | |
download | ninja-1144007ba899e87de73a372b45262f41f8e3e450.tar.gz |
Merge pull request #64 from imix23ways/Timeline
Timeline
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 17 |
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; |