aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss/Layer.scss
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-28 14:01:05 -0800
committerPushkar Joshi2012-02-28 14:01:05 -0800
commit63307c9abf120985d979a40a53a0598d3f0d5c5a (patch)
tree57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/panels/Timeline/Layer.reel/scss/Layer.scss
parente1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz
Merge branch 'master' into pentool
Conflicts: manifest.json
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss/Layer.scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss6
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;