diff options
author | Jonathan Duran | 2012-06-05 08:48:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-05 08:48:27 -0700 |
commit | 28aa692271bfe17cc2b7b1ce7716b99c04f1ab57 (patch) | |
tree | 7c63aa155817a103d83d6441ca37163639a9488b /js/panels/Timeline/Layer.reel/scss | |
parent | bd2c28100f347afc10243c80b8a288746370eee2 (diff) | |
parent | 4338d57eed565f723bfb7cbcefca65836b68953b (diff) | |
download | ninja-28aa692271bfe17cc2b7b1ce7716b99c04f1ab57.tar.gz |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index 8f8881dd..5220d0f1 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss | |||
@@ -274,10 +274,10 @@ | |||
274 | .content-style .item-template { | 274 | .content-style .item-template { |
275 | display: none; | 275 | display: none; |
276 | } | 276 | } |
277 | .style-row { | ||
278 | height: 20px; | ||
279 | } | ||
277 | .content-style .layout-row.selected .layout-cell { | 280 | .content-style .layout-row.selected .layout-cell { |
278 | background-color: $color-panel-hilite-bg; | 281 | background-color: $color-panel-hilite-bg; |
279 | color: $color-panel-hilite-text; | 282 | color: $color-panel-hilite-text; |
280 | } | 283 | } |
281 | .style-row { | ||
282 | height: 20px; | ||
283 | } | ||