diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-07-03 09:45:19 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-07-03 09:45:19 +0200 |
| commit | e9f616b0a03e830ae3ec723a8eff511220810eca (patch) | |
| tree | e5e4fe7567018872f312cd8642097cfe5f889c6e | |
| parent | 1a1c5aa3c09322f2c69f9ed39078f495c840ebd0 (diff) | |
| parent | 0df04975b0f2a938b85c6443f76d44f4706c11c1 (diff) | |
| download | nextcloud-server-e9f616b0a03e830ae3ec723a8eff511220810eca.tar.gz nextcloud-server-e9f616b0a03e830ae3ec723a8eff511220810eca.zip | |
Merge pull request #9391 from owncloud/design-mobile-share
Fix mobile share view glitches
| -rw-r--r-- | apps/files/js/filesummary.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/css/mobile.css | 5 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 8 | ||||
| -rw-r--r-- | core/css/header.css | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js index 104dabf1b04..ca70259335c 100644 --- a/apps/files/js/filesummary.js +++ b/apps/files/js/filesummary.js @@ -181,7 +181,7 @@ var info = t('files', '{dirs} and {files}', infoVars); - var $summary = $('<td><span class="info">'+info+'</span></td>'+fileSize+'<td></td>'); + var $summary = $('<td><span class="info">'+info+'</span></td>'+fileSize+'<td class="date"></td>'); if (!this.summary.totalFiles && !this.summary.totalDirs) { this.$el.addClass('hidden'); diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css index 333c4c77fc9..2a630f552ee 100644 --- a/apps/files_sharing/css/mobile.css +++ b/apps/files_sharing/css/mobile.css @@ -5,6 +5,11 @@ position: absolute !important; } +/* hide text of download button, only show icon */ +#download-text { + display: none; +} + /* hide size and date columns */ table th#headerSize, table td.filesize, diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 87472c5c3b4..3944d8438dd 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -11,8 +11,10 @@ <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename"> <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype"> <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>"> - <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" + title="" id="owncloud"> + <div class="logo-icon svg"></div> + </a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div class="header-right"> <span id="details"> @@ -25,7 +27,7 @@ </span> <a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/> - <?php p($l->t('Download'))?> + <span id="download-text"><?php p($l->t('Download'))?></span> </a> </span> </div> diff --git a/core/css/header.css b/core/css/header.css index d2645c6a7d5..91dfeb798a5 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -230,8 +230,10 @@ padding: 7px 5px; color: #fff; height: 100%; - max-width: 40%; + max-width: 80%; white-space: nowrap; + -moz-box-sizing: border-box; + box-sizing: border-box; } /* Profile picture in header */ |