diff options
author | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
commit | 7c9291a5bab4abd849547f8878f6fb962fc88250 (patch) | |
tree | d5dd4ee6ff901c00b40f3e89c3cfb620e60a5051 /js/panels/Timeline/Layer.reel/scss | |
parent | 6054d13cf1254447d2396889eafc6a953f0b8d4a (diff) | |
parent | 700611c9aaee6093bbf4e86503c1decb5ac65c83 (diff) | |
download | ninja-7c9291a5bab4abd849547f8878f6fb962fc88250.tar.gz |
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index dda0c951..1e574cc0 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss | |||
@@ -197,12 +197,18 @@ | |||
197 | .collapsible-content .layout-table:first-child { | 197 | .collapsible-content .layout-table:first-child { |
198 | border-top: 1px solid $color-menu-divider; | 198 | border-top: 1px solid $color-menu-divider; |
199 | } | 199 | } |
200 | |||
201 | .collapsible-content .hottextunit { | ||
202 | width: auto; | ||
203 | } | ||
200 | .collapsible-transition { | 204 | .collapsible-transition { |
201 | -webkit-transition-property: height; | 205 | -webkit-transition-property: height; |
202 | -webkit-transition-duration: 200ms; | 206 | -webkit-transition-duration: 200ms; |
203 | -webkit-transition-timing-function: ease-in; | 207 | -webkit-transition-timing-function: ease-in; |
204 | } | 208 | } |
205 | 209 | ||
210 | |||
211 | |||
206 | .editable2 { | 212 | .editable2 { |
207 | height: 20px; | 213 | height: 20px; |
208 | background-color: $color-panel-hilite-text !IMPORTANT; | 214 | background-color: $color-panel-hilite-text !IMPORTANT; |