diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 30 | ||||
| -rw-r--r-- | core/css/mobile.scss | 3 | ||||
| -rw-r--r-- | core/css/public.scss | 9 | ||||
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/sharedialogviewSpec.js | 2 |
6 files changed, 19 insertions, 29 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 52a179cc5cb..3b3a87ec714 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 0; + 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 */ @@ -577,7 +574,8 @@ nav[role='navigation'] { background: var(--color-primary) !important; &.skip-content { - left: 253px; + left: $navigation-width; + margin-left: 3px; } &:focus, 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 cac98f23f92..5f02dc1762b 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -7,15 +7,6 @@ $footer-height: 65px; 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; diff --git a/core/js/js.js b/core/js/js.js index a4de1c3dbf6..8e7796143d5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1571,7 +1571,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(); diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 90da279bdb9..da4d887634a 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -25,8 +25,8 @@ ' <span class="shareWithConfirm icon icon-confirm"></span>' + '</div>' + '{{/if}}' + - '<div class="shareeListView subView"></div>' + '<div class="linkShareView subView"></div>' + + '<div class="shareeListView subView"></div>' + '<div class="loading hidden" style="height: 50px"></div>'; /** 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'); }); |