From cab792323d4c136ed336442d7ae6bb9559955591 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 18 Jul 2013 18:31:56 +0200 Subject: [PATCH 1/9] make delete icon less intrusive again, only on hover --- core/css/styles.css | 4 ++++ core/img/actions/delete-hover.png | Bin 0 -> 295 bytes core/img/actions/delete-hover.svg | 12 ++++++++++++ core/img/actions/delete.png | Bin 295 -> 254 bytes core/img/actions/delete.svg | 14 ++++---------- 5 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 core/img/actions/delete-hover.png create mode 100644 core/img/actions/delete-hover.svg diff --git a/core/css/styles.css b/core/css/styles.css index ca2d082eb3..94520a4e0c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -661,8 +661,12 @@ div.crumb:active { /* icons */ .folder-icon { background-image: url('../img/places/folder.svg'); } .delete-icon { background-image: url('../img/actions/delete.svg'); } +.delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.svg'); +} .edit-icon { background-image: url('../img/actions/rename.svg'); } + /* buttons */ button.loading { background-image: url('../img/loading.gif'); diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..99f549faf9b70be5d0917d601485170bfae526d8 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFwM+{iL7^mG#D7zGPR!nT&$J|w1L6X L)z4*}Q$iB}Wn^OS literal 0 HcmV?d00001 diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg new file mode 100644 index 0000000000..568185c5c7 --- /dev/null +++ b/core/img/actions/delete-hover.svg @@ -0,0 +1,12 @@ + + + + + image/svg+xml + + + + + + + diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index 99f549faf9b70be5d0917d601485170bfae526d8..0d8c89a56e2d88463f52bb1901ccf228640ff7a1 100644 GIT binary patch delta 153 zcmZ3^^p9~uZoOiFPl)UP|Nj~Ag1ZGN;XnmkB|(0{3|w0A2@UfXT>bjKBycHE)Y8+% zF@z&JIpF|v1h=Hb5vB&7Z=zg2v8)bk$=6fPi!v!#o()~C)+oAhP1MtdQw^R6MGtR1 d%zK2BVdr%rf!lfSkH&&5_jL7hS?83{1OP%#F82Tc delta 194 zcmeyzxSVN1ZoO83Pl)UP|Nk#CFkE6_xXQqAnStR75(0`Kb06+JX2!t4z*`dJ7tFw| zYnxfN;qKE{AOHUI6Y_`vN`!g3IEHXUCnq>CT zaLwZE-jzi$4UJ!?H9b?YUbdByC#PK9P&4D6Z^DBe)xnLK@9wg(Fzc~~^IYdM7f58i c6Qsewz?P}?{O4k|M4%N6p00i_>zopr07BGC0ssI2 diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index 568185c5c7..ef564bfd48 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -1,12 +1,6 @@ + - - - - image/svg+xml - - - - - - + + + From 197c979d264f15d82e991f45c7155b2172aae3c6 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 18 Jul 2013 18:40:09 +0200 Subject: [PATCH 2/9] use background image instead of img for Files delete icon --- apps/files/js/fileactions.js | 5 +---- core/css/styles.css | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index aa66a57a7b..bb0a27638e 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -125,12 +125,9 @@ var FileActions = { if (typeof trashBinApp !== 'undefined' && trashBinApp) { var html = ''; } else { - var html = ''; + var html = ''; } var element = $(html); - if (img) { - element.append($('')); - } element.data('action', actions['Delete']); element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler); parent.parent().children().last().append(element); diff --git a/core/css/styles.css b/core/css/styles.css index 94520a4e0c..46972331df 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -659,6 +659,10 @@ div.crumb:active { } /* icons */ +.folder-icon, .delete-icon, .edit-icon { + background-repeat: no-repeat; + background-position: center; +} .folder-icon { background-image: url('../img/places/folder.svg'); } .delete-icon { background-image: url('../img/actions/delete.svg'); } .delete-icon:hover, .delete-icon:focus { From 8a25d1ad068b67914ae87159e062c28433a3a789 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 18 Jul 2013 18:41:01 +0200 Subject: [PATCH 3/9] remove unnecessary tipsy for Files delete --- apps/files/js/fileactions.js | 2 +- core/js/js.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index bb0a27638e..59cf007f53 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -125,7 +125,7 @@ var FileActions = { if (typeof trashBinApp !== 'undefined' && trashBinApp) { var html = ''; } else { - var html = ''; + var html = ''; } var element = $(html); element.data('action', actions['Delete']); diff --git a/core/js/js.js b/core/js/js.js index 5158b66d73..6558adbb6a 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -664,7 +664,6 @@ $(document).ready(function(){ $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); - $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); $('#headerSize').tipsy({gravity:'s', fade:true, live:true}); $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); From 4bfd61fb7fcbc6394bbf2ee83f733cd09abb63a3 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 18 Jul 2013 18:46:37 +0200 Subject: [PATCH 4/9] use new delete icon for deleted files as well --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 59cf007f53..ef82cd6346 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -123,7 +123,7 @@ var FileActions = { img = img(file); } if (typeof trashBinApp !== 'undefined' && trashBinApp) { - var html = ''; + var html = ''; } else { var html = ''; } From dba4111aa0bfd387d705391bf9d75f7f43bf1135 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 22 Jul 2013 11:18:51 +0200 Subject: [PATCH 5/9] fix delete button not showing in IE8 --- apps/files/css/files.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f2ca1065ec..6c835a7cdd 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -147,14 +147,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } display:none; } #fileList tr:hover a.action, #fileList a.action.permanent { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)"; - filter: alpha(opacity=.5); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); opacity: .5; display:inline; } #fileList tr:hover a.action:hover { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; - filter: alpha(opacity=1); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); opacity: 1; display:inline; } From cdb993ad69969964c433cf414b549c52b298c67d Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Tue, 23 Jul 2013 17:13:12 +0300 Subject: [PATCH 6/9] Explicit ie8 fallback --- core/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 46972331df..c328804f81 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -685,3 +685,7 @@ button.loading { ::-moz-focus-inner { border: 0; /* remove dotted outlines in Firefox */ } +.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } +.lte8 .delete-icon:hover, .delete-icon:focus { + background-image: url('../img/actions/delete-hover.png'); +} \ No newline at end of file From 33fe24dc3d12868d79f9b137e9e91eba2b3e5028 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 29 Jul 2013 19:27:11 +0300 Subject: [PATCH 7/9] Replace delete icon with spinner --- apps/files/js/filelist.js | 8 +++----- core/css/styles.css | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 04a9fb9164..dc820dc93e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -371,9 +371,7 @@ var FileList={ } for (var i=0; i'; - deleteAction.html(newHTML); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); } // Finish any existing actions if (FileList.lastAction) { @@ -394,8 +392,8 @@ var FileList={ procesSelection(); } else { $.each(files,function(index,file) { - var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash"); - deleteAction.html(oldHTML); + var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('progress-icon').addClass('delete-icon'); }); } }); diff --git a/core/css/styles.css b/core/css/styles.css index 490619c00d..365de759fd 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -659,7 +659,7 @@ div.crumb:active { } /* icons */ -.folder-icon, .delete-icon, .edit-icon { +.folder-icon, .delete-icon, .edit-icon, .progress-icon { background-repeat: no-repeat; background-position: center; } @@ -669,7 +669,7 @@ div.crumb:active { background-image: url('../img/actions/delete-hover.svg'); } .edit-icon { background-image: url('../img/actions/rename.svg'); } - +.progress-icon { background-image: url('../img/loading.gif'); } /* buttons */ button.loading { From 1a1c100719643c6056541ffd208642e9f1653c95 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 30 Jul 2013 10:44:01 +0200 Subject: [PATCH 8/9] fix loading.gif size for both upload and deletion, force visiblity --- apps/files/js/filelist.js | 2 +- core/css/styles.css | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index dc820dc93e..e483626a91 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -15,7 +15,7 @@ var FileList={ // filename td td = $('').attr({ "class": "filename", - "style": 'background-image:url('+iconurl+')' + "style": 'background-image:url('+iconurl+'); background-size: 16px;' }); td.append(''); var link_elem = $('').attr({ diff --git a/core/css/styles.css b/core/css/styles.css index 365de759fd..3af1a31158 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -669,7 +669,13 @@ div.crumb:active { background-image: url('../img/actions/delete-hover.svg'); } .edit-icon { background-image: url('../img/actions/rename.svg'); } -.progress-icon { background-image: url('../img/loading.gif'); } +.progress-icon { + background-image: url('../img/loading.gif'); + background-size: 16px; + /* force show the loading icon, not only on hover */ + opacity: 1 !important; + display: inline !important; +} /* buttons */ button.loading { From b632b8f4e41f12d62fd4abdefa63fc9f9accd432 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 16 Aug 2013 00:02:11 +0200 Subject: [PATCH 9/9] force show loading icon also for IE --- core/css/styles.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 3af1a31158..3b2ffad1e4 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -673,6 +673,8 @@ div.crumb:active { background-image: url('../img/loading.gif'); background-size: 16px; /* force show the loading icon, not only on hover */ + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter:alpha(opacity=100); opacity: 1 !important; display: inline !important; }