]> source.dussan.org Git - nextcloud-server.git/commitdiff
remove some of the flickering in opera
authorRobin Appelman <icewind@owncloud.com>
Sat, 14 Jan 2012 23:11:26 +0000 (00:11 +0100)
committerRobin Appelman <icewind@owncloud.com>
Sat, 14 Jan 2012 23:14:42 +0000 (00:14 +0100)
apps/media/css/music.css
core/css/styles.css
files/css/files.css
files/js/fileactions.js

index 41ade44a66f15ae3488c948632e9755a5792eb3c..da0407fca5834a1e3f09611706c75402f4966ebe 100644 (file)
@@ -20,8 +20,8 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 
 #collection { padding-top:1em; position:relative; width:100%; float:left; }
 #collection li.album,#collection li.song { margin-left:3em; }
-#leftcontent img.remove { display:none; float:right; cursor:pointer; }
-#leftcontent li:hover img.remove { display:inline; }
+#leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
+#leftcontent li:hover img.remove { display:inline; opacity: .3; }
 #leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
 #collection li button { float:right; }
 #collection li,#playlist li { list-style-type:none; }
index 76e1e5760b8e4875bfc7b09adb1cb6cb27597b74..53af8b383e3aab039e2273ad8cef6eeaf2bd913d 100644 (file)
@@ -106,6 +106,7 @@ label.infield { cursor: text !important; }
 #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
 .action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+.action { width: 16px; height: 16px; }
 .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
index b384fef0b78da092d125eabcc02dfe0c694b3e67..6c4d603b4a664c96a5c04030e0bf056096a5eb7a 100644 (file)
@@ -70,6 +70,7 @@ table thead.fixed { height:2em; }
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+a.action>img{ max-height:16px; max-width:16px; }
 .selectedActions { display:none; }
 
 /* add breadcrumb divider to the File item in navigation panel */
index 6f0729e43b6ad6c729c059f23fe5813d3865bd03..b5dd3982803405ef8eadbde0fbcc7472a36922a0 100644 (file)
@@ -66,7 +66,7 @@ FileActions={
                                if(img.call){
                                        img=img(file);
                                }
-                               var html='<a href="#" title="'+name+'" class="action" />';
+                               var html='<a href="#" title="'+name+'" class="action" style="display:none" />';
                                var element=$(html);
                                if(img){
                                        element.append($('<img src="'+img+'"/>'));
@@ -80,6 +80,7 @@ FileActions={
                                        FileActions.hide();
                                        action(currentFile);
                                });
+                               element.hide();
                                parent.children('a.name').append(element);
                        }
                }
@@ -88,7 +89,7 @@ FileActions={
                        if(img.call){
                                img=img(file);
                        }
-                       var html='<a href="#" title="Delete" class="action" />';
+                       var html='<a href="#" title="Delete" class="action" style="display:none" />';
                        var element=$(html);
                        if(img){
                                element.append($('<img src="'+img+'"/>'));
@@ -102,10 +103,13 @@ FileActions={
                                FileActions.hide();
                                action(currentFile);
                        });
+                       element.hide();
                        parent.parent().children().last().append(element);
                }
-               $('#fileList .action').hide();
-               $('#fileList .action').fadeIn(200);
+               $('#fileList .action').css('-o-transition-property','none');//temporarly disable 
+               $('#fileList .action').fadeIn(200,function(){
+                       $('#fileList .action').css('-o-transition-property','opacity');
+               });
                return false;
        },
        hide:function(){