diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-02 16:59:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 16:59:24 +0200 |
| commit | 6ca4b9eee9793419179b8abb0440bb1e8e5cf38f (patch) | |
| tree | 3bc697a6ea176da42eeede854cdd1b10a28cb454 /core | |
| parent | 6290ba829980c51daaeb4959c24a714223aab613 (diff) | |
| parent | 717a44f161c40f5ac5fc74a3dc519bcc71476645 (diff) | |
| download | nextcloud-server-6ca4b9eee9793419179b8abb0440bb1e8e5cf38f.tar.gz nextcloud-server-6ca4b9eee9793419179b8abb0440bb1e8e5cf38f.zip | |
Merge pull request #5920 from nextcloud/gallery-share-view-fix
Top bar buttons in share view are wrong positioned
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 8 | ||||
| -rw-r--r-- | core/js/js.js | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 41bb5783090..e744d3acb40 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -137,18 +137,18 @@ vertical-align: middle; } - #header-left, - #header-right { + #header-left, .header-left, + #header-right, .header-right { display: inline-flex; align-items: center; } - #header-left { + #header-left, .header-left { flex: 0 0; flex-grow: 1; } - #header-right { + #header-right, .header-right { justify-content: flex-end; } } diff --git a/core/js/js.js b/core/js/js.js index 2aa7bf1bc55..c02ef5c7920 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1203,7 +1203,7 @@ OC.Notification={ /** * Updates (replaces) a sanitized notification. - * + * * @param {string} text Message to display * @return {jQuery} JQuery element for notificaiton row */ @@ -1512,7 +1512,7 @@ function initCore() { var resizeMenu = function() { var appList = $('#appmenu li'); - var headerWidth = $('#header-left').width() - $('#nextcloud').width() + var headerWidth = $('.header-left').width() - $('#nextcloud').width() var usePercentualAppMenuLimit = 0.33; var minAppsDesktop = 8; var availableWidth = headerWidth - $(appList).width(); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 337032ab664..6b9db9389ba 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,7 +31,7 @@ <div id="notification"></div> </div> <header role="banner"><div id="header"> - <div id="header-left"> + <div class="header-left"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" id="nextcloud" tabindex="1"> <div class="logo logo-icon"> @@ -96,7 +96,7 @@ </div> - <div id="header-right"> + <div class="header-right"> <form class="searchbox" action="#" method="post" role="search" novalidate> <label for="searchbox" class="hidden-visually"> <?php p($l->t('Search'));?> |