From 3cb52b868a0eba7bdfb6a03fed24447873735dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 15:45:39 +0200 Subject: Fix header calculation and better public design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/public.scss | 15 ++++++++++++--- core/css/header.scss | 27 ++++++++++++--------------- core/js/js.js | 2 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 3d6fc62ceba..2b83db46007 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -160,17 +160,26 @@ thead { } #header .header-shared-by { - display: inline-block; color: var(--color-primary-text); position: relative; - top: -10px; font-weight: 300; font-size: 11px; opacity: .57; - margin-top: 10px; } #note { text-align: center; padding: 10px; } + + +// hide the primary on public share on mobile +@media only screen and (max-width: 768px) { + #body-public { + .header-right { + #header-primary-action { + display: none; + } + } + } +} \ No newline at end of file diff --git a/core/css/header.scss b/core/css/header.scss index 41ee0a63fbe..a4ea6c0d75f 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -56,10 +56,15 @@ /* LOGO and APP NAME -------------------------------------------------------- */ #nextcloud { - padding: 8px 12px; + padding: 7px 12px; + padding-left: 86px; // logo width + 2* pa + position: relative; height: 100%; box-sizing: border-box; opacity: 1; + display: flex; + align-items: center; + flex-wrap: wrap; &:focus { opacity: .75; } @@ -107,12 +112,10 @@ background-repeat: no-repeat; background-size: contain; background-position: center; - width: 256px; - height: 128px; - margin: 0 auto; - &.logo-icon { - width: 62px; - height: 34px; + width: 62px; + height: 100%; + position: absolute; + left: 12px; img { opacity: 0; @@ -121,10 +124,8 @@ } } - } .header-appname-container { display: none; - padding-top: 22px; padding-right: 10px; flex-shrink: 0; } @@ -153,7 +154,6 @@ #header-right, .header-right { justify-content: flex-end; - flex-basis: 210px; flex-shrink: 1; } @@ -207,15 +207,12 @@ /* show appname next to logo */ .header-appname { - display: inline-block; - position: relative; color: var(--color-primary-text); font-size: 16px; font-weight: 300; margin: 0; - margin-top: -26px; - padding: 7px 0 7px 5px; - vertical-align: middle; + padding: 0; + padding-right: 5px; } /* do not show menu toggle on public share links as there is no menu */ diff --git a/core/js/js.js b/core/js/js.js index 2812cba988c..201f4d7f09b 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1566,7 +1566,7 @@ function initCore() { var resizeMenu = function() { var appList = $('#appmenu li'); - var headerWidth = $('.header-left').width() - $('#nextcloud').width(); + var headerWidth = $('.header-left').outerWidth() - $('#nextcloud').outerWidth(); var usePercentualAppMenuLimit = 0.33; var minAppsDesktop = 8; var availableWidth = headerWidth - $(appList).width(); -- cgit v1.2.3 From ac2c925231253847bfa0fc99f5002b3f92a5b8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 16:45:40 +0200 Subject: Fix mobile view and add public share note view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/public.scss | 12 ++++++---- apps/files_sharing/js/public_note.js | 28 ++++++++++++++++++++++ .../lib/Controller/ShareController.php | 1 + apps/files_sharing/templates/public.php | 11 +++++++-- core/css/mobile.scss | 3 ++- core/css/public.scss | 9 ------- 6 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 apps/files_sharing/js/public_note.js diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 2b83db46007..708fe1f2182 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -167,12 +167,16 @@ thead { opacity: .57; } -#note { - text-align: center; - padding: 10px; +#note-content { + padding: 5px; + display:inline-block; + width: 350px; + .content { + overflow: auto; + max-height: 200px; + } } - // hide the primary on public share on mobile @media only screen and (max-width: 768px) { #body-public { diff --git a/apps/files_sharing/js/public_note.js b/apps/files_sharing/js/public_note.js new file mode 100644 index 00000000000..f8aa4cf5a60 --- /dev/null +++ b/apps/files_sharing/js/public_note.js @@ -0,0 +1,28 @@ +/** + * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com) + * + * @author John Molakvoæ (skjnldsv) + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + + $(document).ready(function() { + var noteHtml = document.getElementById('notemenu').outerHTML + $(noteHtml).insertBefore('#header-primary-action'); + $('#notemenu').removeClass('hidden'); + OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu')) + }) \ No newline at end of file diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 9594d6e71f5..6b30747c79f 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -386,6 +386,7 @@ class ShareController extends AuthPublicShareController { \OCP\Util::addScript('files', 'file-upload'); \OCP\Util::addStyle('files_sharing', 'publicView'); \OCP\Util::addScript('files_sharing', 'public'); + \OCP\Util::addScript('files_sharing', 'public_note'); \OCP\Util::addScript('files', 'fileactions'); \OCP\Util::addScript('files', 'fileactionsmenu'); \OCP\Util::addScript('files', 'jquery.fileupload'); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 1c552b7d476..da80f8d1377 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -30,8 +30,15 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); -
- t('Note:')); p(' ' . $_['note']); ?> + diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 1b067c9527f..8fff98af4d6 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -132,7 +132,8 @@ } @media only screen and (max-width: 480px) { - #header .header-right .menu { + #header .header-left > nav > .menu, + #header .header-right > div > .menu { max-width: calc(100vw - 10px); position: fixed; &::after { diff --git a/core/css/public.scss b/core/css/public.scss index a4e7ed579b9..1667ba18cda 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -7,15 +7,6 @@ $footer-height: 60px; color: var(--color-primary-text); } - .menutoggle, - #header-primary-action[class^='icon-'] { - padding: 14px; - padding-right: 40px; - background-position: right 15px center; - color: var(--color-primary-text); - cursor: pointer; - } - #header-secondary-action { margin-right: 13px; -- cgit v1.2.3 From ddd18aa3754f4787608726c0ffed71eda480dbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 16:53:18 +0200 Subject: Fix public link order and fix skip to content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/header.scss | 3 ++- core/js/sharedialogview.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/css/header.scss b/core/css/header.scss index a4ea6c0d75f..1cd8e8e81b7 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -573,7 +573,8 @@ nav[role='navigation'] { background: var(--color-primary) !important; &.skip-content { - left: 253px; + left: $navigation-width; + margin-left: 3px; } &:focus, diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 9fa1847d3d5..5762db7740a 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -24,9 +24,9 @@ ' '+ ' ' + '
' + + '
' + '{{/if}}' + '
' + - '
' + ''; /** -- cgit v1.2.3 From fb40627c8c9cdbdf0147baf10e6f230ad23c0ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 24 Aug 2018 17:32:31 +0200 Subject: Fix header logo padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/css/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/header.scss b/core/css/header.scss index 1cd8e8e81b7..b12ab5c6ac7 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -56,7 +56,7 @@ /* LOGO and APP NAME -------------------------------------------------------- */ #nextcloud { - padding: 7px 12px; + padding: 7px 0; padding-left: 86px; // logo width + 2* pa position: relative; height: 100%; -- cgit v1.2.3 From 421daf6ab0d69ab9e17ffdeeea4a23d0af3dd6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 17:40:05 +0200 Subject: Fix public share link order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/js/sharedialogview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 5762db7740a..16ddcf1d56b 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -24,8 +24,8 @@ ' '+ ' ' + '' + - '
' + '{{/if}}' + + '
' + '
' + ''; -- cgit v1.2.3 From 719f9288b97bcd6c9de42d0eb682e11a38ab864b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 20:31:29 +0200 Subject: Tests fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/js/public_note.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/js/public_note.js b/apps/files_sharing/js/public_note.js index f8aa4cf5a60..a303d6c7675 100644 --- a/apps/files_sharing/js/public_note.js +++ b/apps/files_sharing/js/public_note.js @@ -21,8 +21,11 @@ */ $(document).ready(function() { - var noteHtml = document.getElementById('notemenu').outerHTML - $(noteHtml).insertBefore('#header-primary-action'); - $('#notemenu').removeClass('hidden'); - OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu')) + var noteElmt = document.getElementById('notemenu') + if (noteElmt) { + var noteHtml = noteElmt.outerHTML + $(noteHtml).insertBefore('#header-primary-action'); + $('#notemenu').removeClass('hidden'); + OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu')) + } }) \ No newline at end of file -- cgit v1.2.3 From 13230f180a897cd56489102c6e91d39fb8e1e2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 24 Aug 2018 22:05:43 +0200 Subject: Fix jsunit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/js/tests/specs/sharedialogviewSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js index 33d3be51440..20504c56b67 100644 --- a/core/js/tests/specs/sharedialogviewSpec.js +++ b/core/js/tests/specs/sharedialogviewSpec.js @@ -303,7 +303,7 @@ describe('OC.Share.ShareDialogView', function() { }); it('test avatar for circle', function() { - var avatarElement = dialog.$('.avatar').eq(4); + var avatarElement = dialog.$('.avatar').eq(5); expect(avatarElement.css('background')).toContain('path/to/the/avatar'); }); -- cgit v1.2.3