diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2019-06-12 17:42:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 17:42:36 +0200 |
| commit | 452d7696ff7e663f1794742d9708bb62a2771097 (patch) | |
| tree | e10305eda143475bfd202e33f20841c4b9af64ac | |
| parent | dc9e73a6df24136ea18bf630ae07cb333817a8ef (diff) | |
| parent | c887564e4f97d3b7b82ead6644031e5c408f7085 (diff) | |
| download | nextcloud-server-452d7696ff7e663f1794742d9708bb62a2771097.tar.gz nextcloud-server-452d7696ff7e663f1794742d9708bb62a2771097.zip | |
Merge pull request #15937 from nextcloud/fix-download-entry-shown-on-public-share-menu-when-not-in-mobile
Fix download entry shown on public share menu when not in mobile
| -rw-r--r-- | apps/files_sharing/css/public.scss | 2 | ||||
| -rw-r--r-- | tests/acceptance/features/bootstrap/PublicShareContext.php | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 13a3ee291fa..f0f367d5596 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -195,7 +195,7 @@ thead { // hide the download entry on the menu // on public share when NOT on mobile -@media only screen and (min-width: $mobile_breakpoint + 1) { +@media only screen and (min-width: $breakpoint-mobile + 1) { #body-public { .header-right { #header-actions-menu { diff --git a/tests/acceptance/features/bootstrap/PublicShareContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php index 02508330391..891c231b164 100644 --- a/tests/acceptance/features/bootstrap/PublicShareContext.php +++ b/tests/acceptance/features/bootstrap/PublicShareContext.php @@ -202,11 +202,14 @@ class PublicShareContext implements Context, ActorAwareInterface { // download item should not be shown in the menu (although it will be in // the DOM). PHPUnit_Framework_Assert::assertFalse( - $this->actor->find(self::downloadItemInShareMenu())->isVisible()); + $this->actor->find(self::downloadItemInShareMenu())->isVisible(), + "Download item in share menu is visible"); PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::directLinkItemInShareMenu())->isVisible()); + $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), + "Direct link item in share menu is not visible"); PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::saveItemInShareMenu())->isVisible()); + $this->actor->find(self::saveItemInShareMenu())->isVisible(), + "Save item in share menu is not visible"); } /** |