wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:owncloud/owncloud

Browse source
This commit is contained in:
Georg Ehrke 2012-01-15 00:31:23 +01:00
commit fed7eef4f3
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/media/css/music.css
View 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; }

1
core/css/styles.css
View 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; }

1
files/css/files.css
View 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 */

12
files/js/fileactions.js
View 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(){