diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/Timeline/Layer.reel/scss/Layer.scss | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss/Layer.scss')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 2 |
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 | } |