diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 7 | ||||
| -rw-r--r-- | core/css/public.scss | 5 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 10 | ||||
| -rw-r--r-- | core/templates/twofactorselectchallenge.php | 10 |
4 files changed, 24 insertions, 8 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 39d97865ec0..4c0f05f9cc6 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -65,6 +65,8 @@ display: flex; align-items: center; flex-wrap: wrap; + overflow: hidden; + &:focus { opacity: .75; } @@ -151,6 +153,7 @@ flex: 0 0; flex-grow: 1; white-space: nowrap; + overflow: hidden; } #header-right, .header-right { @@ -206,7 +209,7 @@ } } -/* show appname next to logo */ +/* only used for public share pages now as we have the app icons when logged in */ .header-appname { color: var(--color-primary-text); font-size: 16px; @@ -214,6 +217,8 @@ margin: 0; padding: 0; padding-right: 5px; + overflow: hidden; + text-overflow: ellipsis; } /* do not show menu toggle on public share links as there is no menu */ diff --git a/core/css/public.scss b/core/css/public.scss index 5f02dc1762b..0edf391fa49 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -8,8 +8,6 @@ $footer-height: 65px; } #header-secondary-action { - margin-right: 13px; - ul li { min-width: 270px; } @@ -73,8 +71,11 @@ $footer-height: 65px; a { color: var(--color-text-lighter); font-weight: 600; + white-space: nowrap; + /* increasing clickability to more than the text height */ padding: 13px; margin: -13px; + line-height: 200%; } } } diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 736404e2681..9cd48aaf9a7 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -406,7 +406,7 @@ permissions: permissions }); }, - + showNoteForm: function(event) { event.preventDefault(); event.stopPropagation(); @@ -431,9 +431,9 @@ var shareId = $li.data('share-id'); var $menu = $element.closest('li'); var $form = $menu.next('li.share-note-form'); - + $form.find('.share-note').val(''); - + $form.addClass('hidden'); $menu.find('.share-note-delete').hide(); @@ -600,7 +600,7 @@ var popover = this.popoverMenuTemplate({ cid: this.model.get('linkShare').id, - copyLabel: t('core', 'Copy URL'), + copyLabel: t('core', 'Copy link'), social: social, shareLinkURL: this.model.get('linkShare').link, @@ -745,7 +745,7 @@ var datePicker = $(expirationDatePicker); var state = $element.prop('checked'); datePicker.toggleClass('hidden', !state); - + if (!state) { // disabled, let's hide the input and // set the expireDate to nothing diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php index 55d315d904d..c3c35c7fec4 100644 --- a/core/templates/twofactorselectchallenge.php +++ b/core/templates/twofactorselectchallenge.php @@ -6,6 +6,15 @@ <strong><?php p($l->t('Could not load at least one of your enabled two-factor auth methods. Please contact your admin.')) ?></strong> </p> <?php endif; ?> + <?php if (empty($_['providers'])): ?> + <p> + <?php if (is_null($_['backupProvider'])): ?> + <strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance.')) ?></strong> + <?php else: ?> + <strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong> + <?php endif; ?> + </p> + <?php else: ?> <p> <ul> <?php foreach ($_['providers'] as $provider): ?> @@ -23,6 +32,7 @@ <?php endforeach; ?> </ul> </p> + <?php endif ?> <p class="two-factor-link"> <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> <?php if (!is_null($_['backupProvider'])): ?> |