diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-03 08:28:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 08:28:26 +0100 |
| commit | f159d8d8351e9200788fba65e0d4735563b49727 (patch) | |
| tree | 7c889edc48b0f1e3344a06072ef7042947d92aef /apps | |
| parent | db9b14733c1d320f5bee7ac2d63966196f80c358 (diff) | |
| parent | c500b197622e7524b1e6bd250cbc65145ccccda4 (diff) | |
| download | nextcloud-server-f159d8d8351e9200788fba65e0d4735563b49727.tar.gz nextcloud-server-f159d8d8351e9200788fba65e0d4735563b49727.zip | |
Merge pull request #7634 from Abijeet/bug-7539
Fixes the delete button not appearing on certain lower resolutions
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.scss | 4 | ||||
| -rw-r--r-- | apps/files/css/mobile.scss | 22 | ||||
| -rw-r--r-- | apps/files/templates/list.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/index.php | 4 |
4 files changed, 33 insertions, 1 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 00060ee7bd6..b29ce9ea950 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -542,6 +542,10 @@ a.action > img { vertical-align: text-bottom; margin-bottom: -1px; } +/* hide the delete icon in name column normal resolutions */ +table th#headerName .selectedActions .delete-selected { + display: none; +} #fileList td a { a.action { diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss index 10fa29e7a38..703ae499835 100644 --- a/apps/files/css/mobile.scss +++ b/apps/files/css/mobile.scss @@ -12,7 +12,6 @@ min-width: initial !important; } -/* hide size and date columns */ table th#headerSize, table td.filesize, table th#headerDate, @@ -52,6 +51,11 @@ table td.filename .nametext .innernametext { max-width: calc(100% - 175px) !important; } +/* show the delete icon in name column in lower resolutions */ +table th#headerName .selectedActions .delete-selected { + display: inline; +} + /* proper notification area for multi line messages */ #notification-container { display: flex; @@ -75,3 +79,19 @@ table.dragshadow { } } +@media only screen and (max-width: 480px) { + /* Only show icons */ + table th .selectedActions a span:not(.icon) { + display: none; + } + + /* Increase touch area for the icons */ + table th .selectedActions a { + padding: 17px 14px; + } + + /* Remove the margin to reduce the overlap between the name and the icons */ + table.multiselect th .columntitle.name { + margin-left: 0; + } +} diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 92f64a52a28..fd5423c334f 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -59,6 +59,10 @@ <span class="icon icon-download"></span> <span><?php p($l->t('Download'))?></span> </a> + <a href="" class="delete-selected"> + <span class="icon icon-delete"></span> + <span><?php p($l->t('Delete'))?></span> + </a> </span> </div> </th> diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index b3ebca2867b..a4459947d09 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -35,6 +35,10 @@ <span class="icon icon-history"></span> <span><?php p($l->t('Restore'))?></span> </a> + <a href="" class="delete-selected"> + <span class="icon icon-delete"></span> + <span><?php p($l->t('Delete'))?></span> + </a> </span> </div> </th> |