aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-05 14:35:37 -0800
committerPushkar Joshi2012-03-05 14:35:37 -0800
commitc155cd238b6f9e0b8191e0fc533f7bc974b762c2 (patch)
tree645c056432ade1d7cfe4ae2f358e068dd883d598 /js/panels/Timeline/Layer.reel/scss
parentdc3c813320c8d3fb837d5d18e70ab35a53b116c1 (diff)
parent13f52cf0c74f53a919fa864f86669e8155f82961 (diff)
downloadninja-c155cd238b6f9e0b8191e0fc533f7bc974b762c2.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 1e574cc0..12b6e599 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -144,7 +144,7 @@
144.collapsible-content .collapsible-clicker { 144.collapsible-content .collapsible-clicker {
145 left: 12px; 145 left: 12px;
146} 146}
147.content-layer.collapsible-collapsed { 147.container-layer .collapsible-content.collapsible-collapsed {
148 height: 0px; 148 height: 0px;
149 overflow: hidden; 149 overflow: hidden;
150} 150}