mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6112 from nextcloud/backport-5920-12 

[stable12] Top bar buttons in share view are wrong positioned
This commit is contained in:
Joas Schilling 2017-08-16 11:12:53 +02:00 committed by GitHub
parent 7913d33de9 83616aea4f
commit fa8e202e65
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/templates/public.php
View File

@ -35,7 +35,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
<div id="header-left">
<div class="header-left">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
title="" id="nextcloud">
<div class="logo-icon svg"></div>
@ -46,7 +46,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
</div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div id="header-right">
<div class="header-right">
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
if ($_['server2serversharing']) {
?>

8
core/css/header.scss
View File

@ -141,18 +141,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;
}
}

4
core/js/js.js
View File

@ -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();

4
core/templates/layout.user.php
View File

@ -43,7 +43,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-icon">
@ -109,7 +109,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'));?>