diff options
author | Björn Schießle <bjoern@schiessle.org> | 2016-12-01 16:42:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-01 16:42:47 +0100 |
commit | 5cea7f35e124ea7a6b8352a1d05c00069e8814ae (patch) | |
tree | ec1fe29bf925c8e3fd9bb6d60713e2f034a7930f | |
parent | de807fd88214c45b47e1b45c0c4933f2c6bcf36f (diff) | |
parent | a4e2dc3033e40b58e5e72e2bda85a327ff092464 (diff) | |
download | nextcloud-server-5cea7f35e124ea7a6b8352a1d05c00069e8814ae.tar.gz nextcloud-server-5cea7f35e124ea7a6b8352a1d05c00069e8814ae.zip |
Merge pull request #2436 from nextcloud/fix_inline_action_gone
We should always show permanent actions
-rw-r--r-- | apps/files/css/files.css | 10 | ||||
-rw-r--r-- | apps/files_trashbin/css/trash.css | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 96b883bbc62..5906cbc5c31 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -662,20 +662,16 @@ html.ie8 .column-mtime .selectedActions { /* show share action of shared items darker to distinguish from non-shared */ #fileList a.action.action-share.permanent.shared-style, -#fileList a.action.action-favorite.permanent, /* show hovered permanent entries darker */ -#fileList tr a.action.action-share.permanent:hover, -#fileList tr a.action.action-share.permanent:focus, -#fileList tr a.action.action-menu.permanent:hover, -#fileList tr a.action.action-menu.permanent:focus { +#fileList tr a.action.action.permanent:hover, +#fileList tr a.action.action.permanent:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important; filter: alpha(opacity=70) !important; opacity: .7 !important; display:inline; } /* always show actions on mobile, not only on hover */ -#fileList a.action.action-share.permanent, -#fileList a.action.action-menu.permanent { +#fileList a.action.permanent { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important; filter: alpha(opacity=30) !important; opacity: .3 !important; diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index 053e2e7002c..951497394c3 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -8,10 +8,14 @@ * */ #app-content-trashbin tbody tr[data-type="file"] td a.name, -#app-content-trashbin tbody tr[data-type="file"] td a.name span { +#app-content-trashbin tbody tr[data-type="file"] td a.name { cursor: default; } +span.nametext, span.innernametext, span.extension { + cursor: default; +} + #app-content-trashbin .summary :last-child { padding: 0; } |