wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12316 from nextcloud/public-download-button-fix

Browse source 
Better primary visual on public pages
This commit is contained in:
Roeland Jago Douma 2018-11-07 22:31:31 +01:00 committed by GitHub
commit a8fb7e148d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/files_sharing/css/public.scss
View file

@ -192,6 +192,20 @@ thead {
font-weight: bold; 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 // hide the primary on public share on mobile
@media only screen and (max-width: 768px) { @media only screen and (max-width: 768px) {
#body-public { #body-public {

6
core/templates/layout.public.php
View file

@ -51,18 +51,18 @@
?> ?>
<div class="header-right"> <div class="header-right">
<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>"> <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> <span><?php p($primary->getLabel()) ?></span>
</a> </a>
</span> </span>
<?php if($template->getActionCount()>1) { ?> <?php if($template->getActionCount() > 1) { ?>
<div id="header-secondary-action"> <div id="header-secondary-action">
<span id="header-actions-toggle" class="menutoggle icon-more-white"></span> <span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
<div id="header-actions-menu" class="popovermenu menu"> <div id="header-actions-menu" class="popovermenu menu">
<ul> <ul>
<?php <?php
/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */ /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
foreach($template->getOtherActions() as $action) { foreach($others as $action) {
print_unescaped($action->render()); print_unescaped($action->render());
} }
?> ?>