aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
diff options
context:
space:
mode:
authorJonathan Duran2012-04-12 09:11:18 -0700
committerJonathan Duran2012-04-12 09:11:18 -0700
commitfdd6837c9cf61ca57657f0c4d35d6100c83e936e (patch)
treeb80828886ca405b74364c8e7021dbf93719dd43c /js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
parent931c11bff128471dd51e0bab3ce5d38e7c6fc68c (diff)
parent6a6a45df08de580d6f8597c9a870f72d9bda5c05 (diff)
downloadninja-fdd6837c9cf61ca57657f0c4d35d6100c83e936e.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 5ff710a1..716ee3d3 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -313,9 +313,12 @@
313} 313}
314 314
315/* Configuration menu */ 315/* Configuration menu */
316.layer-master {
317 position: relative;
318}
316.tl-configbutton { 319.tl-configbutton {
317 position: absolute; 320 position: absolute;
318 top: 23px; 321 top: 0px;
319 right: 2px; 322 right: 2px;
320 width: 20px; 323 width: 20px;
321 height: 20px; 324 height: 20px;
@@ -340,7 +343,7 @@
340 box-shadow: 2px 2px 2px $color-app-shadow; 343 box-shadow: 2px 2px 2px $color-app-shadow;
341 display: none; 344 display: none;
342} 345}
343.tl-configbutton:hover .tl-dropdown { 346.tl-configbutton.checked .tl-dropdown {
344 display: block; 347 display: block;
345} 348}
346 349