diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-11-07 22:31:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 22:31:31 +0100 |
| commit | a8fb7e148dedcbae2f454251b98ae865f92106f6 (patch) | |
| tree | a4467b6376263468027af62605253fab0120e396 | |
| parent | 3e8ea395e992a1cad09352e2b7feb3a36574f470 (diff) | |
| parent | f54b201f234e1cb9bfe99a5086caaa6229f43253 (diff) | |
| download | nextcloud-server-a8fb7e148dedcbae2f454251b98ae865f92106f6.tar.gz nextcloud-server-a8fb7e148dedcbae2f454251b98ae865f92106f6.zip | |
Merge pull request #12316 from nextcloud/public-download-button-fix
Better primary visual on public pages
| -rw-r--r-- | apps/files_sharing/css/public.scss | 14 | ||||
| -rw-r--r-- | core/templates/layout.public.php | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index b8a5dbf4f38..c31b4f82bed 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -192,6 +192,20 @@ thead { font-weight: bold; } +// hide the download entry on the menu +// on public share when NOT on mobile +@media only screen and (min-width: 769px) { + #body-public { + .header-right { + #header-actions-menu { + > ul > li#download { + display: none; + } + } + } + } +} + // hide the primary on public share on mobile @media only screen and (max-width: 768px) { #body-public { diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 0558da52d0b..8a87e88a16c 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -51,18 +51,18 @@ ?> <div class="header-right"> <span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>"> - <a href="<?php p($primary->getLink()); ?>"> + <a href="<?php p($primary->getLink()); ?>" class="primary button"> <span><?php p($primary->getLabel()) ?></span> </a> </span> - <?php if($template->getActionCount()>1) { ?> + <?php if($template->getActionCount() > 1) { ?> <div id="header-secondary-action"> <span id="header-actions-toggle" class="menutoggle icon-more-white"></span> <div id="header-actions-menu" class="popovermenu menu"> <ul> <?php /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */ - foreach($template->getOtherActions() as $action) { + foreach($others as $action) { print_unescaped($action->render()); } ?> |