diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-08-12 22:10:43 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-08-13 00:23:15 +0200 |
| commit | 42c5a24dc3f67bde57c8d4180e71abb1b1aefe70 (patch) | |
| tree | 1ba8f3219bf87cb6144907e2483ebf9b6f80cc7d /files | |
| parent | c2a5b4983404685f2707ed7f31deae0088de12d7 (diff) | |
| download | nextcloud-server-42c5a24dc3f67bde57c8d4180e71abb1b1aefe70.tar.gz nextcloud-server-42c5a24dc3f67bde57c8d4180e71abb1b1aefe70.zip | |
more fancy fading
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 16 | ||||
| -rw-r--r-- | files/js/fileactions.js | 7 |
2 files changed, 14 insertions, 9 deletions
diff --git a/files/css/files.css b/files/css/files.css index 262feb3c7f0..b54ea36e6ad 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -26,19 +26,19 @@ /* FILE TABLE */ span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } table { position:relative; top:37px; width:100%; } -table tr { -webkit-transition:background-color 100ms ease-in 100ms; --moz-transition:background-color 100ms ease-in 100ms; --o-transition:background-color 100ms ease-in 100ms; -transition:background-color 100ms ease-in 100ms; } +table tr { -webkit-transition:background-color ease-in 200ms; +-moz-transition:background-color ease-in 200ms; +-o-transition:background-color ease-in 200ms; +transition:background-color ease-in 200ms; } tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; } tbody tr.selected { background-color:#eee; } tbody a { color:#000; } span.extention, td.date { color:#999; } span.extention { opacity:0; --webkit-transition:opacity 100ms ease-in 100ms; --moz-transition:opacity 100ms ease-in 100ms; --o-transition:opacity 100ms ease-in 100ms; -transition:opacity 100ms ease-in 100ms; } +-webkit-transition:opacity ease-in 200ms; +-moz-transition:opacity ease-in 200ms; +-o-transition:opacity ease-in 200ms; +transition:opacity ease-in 200ms; } tr:hover span.extention { opacity:1; } div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } div.crumb:first-child { padding-left:1.5em; } diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 1ba265142be..2bc79abe723 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -53,6 +53,7 @@ FileActions={ }, display:function(parent){ FileActions.currentFile=parent; + $('.file_action').remove(); var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); var file=FileActions.getCurrentFile(); if($('tr[data-file="'+file+'"]').data('renaming')){ @@ -100,10 +101,14 @@ FileActions={ }); parent.parent().children().last().append(element); } + $('.file_action').hide(); + $('.file_action').fadeIn(200); return false; }, hide:function(){ - $('.file_action').remove(); + $('.file_action').fadeOut(200,function(){ + $(this).remove(); + }); }, getCurrentFile:function(){ return FileActions.currentFile.parent().attr('data-file'); |