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

Merge pull request #5920 from nextcloud/gallery-share-view-fix 

Top bar buttons in share view are wrong positioned
This commit is contained in:
Morris Jobke 2017-08-02 16:59:24 +02:00 committed by GitHub
parent 6290ba8299 717a44f161
commit 6ca4b9eee9
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')) ?>"> <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
<div id="header-left"> <div class="header-left">
<span id="nextcloud"> <span id="nextcloud">
<div class="logo logo-icon svg"></div> <div class="logo logo-icon svg"></div>
<h1 class="header-appname"> <h1 class="header-appname">
@ -48,7 +48,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
</div> </div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></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)) { <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
if ($_['server2serversharing']) { if ($_['server2serversharing']) {
?> ?>

8
core/css/header.scss
View File

@ -137,18 +137,18 @@
vertical-align: middle; vertical-align: middle;
} }
#header-left, #header-left, .header-left,
#header-right { #header-right, .header-right {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
} }
#header-left { #header-left, .header-left {
flex: 0 0; flex: 0 0;
flex-grow: 1; flex-grow: 1;
} }
#header-right { #header-right, .header-right {
justify-content: flex-end; justify-content: flex-end;
} }
} }

2
core/js/js.js
View File

@ -1512,7 +1512,7 @@ function initCore() {
var resizeMenu = function() { var resizeMenu = function() {
var appList = $('#appmenu li'); var appList = $('#appmenu li');
var headerWidth = $('#header-left').width() - $('#nextcloud').width() var headerWidth = $('.header-left').width() - $('#nextcloud').width()
var usePercentualAppMenuLimit = 0.33; var usePercentualAppMenuLimit = 0.33;
var minAppsDesktop = 8; var minAppsDesktop = 8;
var availableWidth = headerWidth - $(appList).width(); var availableWidth = headerWidth - $(appList).width();

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

@ -31,7 +31,7 @@
<div id="notification"></div> <div id="notification"></div>
</div> </div>
<header role="banner"><div id="header"> <header role="banner"><div id="header">
<div id="header-left"> <div class="header-left">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" <a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
id="nextcloud" tabindex="1"> id="nextcloud" tabindex="1">
<div class="logo logo-icon"> <div class="logo logo-icon">
@ -96,7 +96,7 @@
</div> </div>
<div id="header-right"> <div class="header-right">
<form class="searchbox" action="#" method="post" role="search" novalidate> <form class="searchbox" action="#" method="post" role="search" novalidate>
<label for="searchbox" class="hidden-visually"> <label for="searchbox" class="hidden-visually">
<?php p($l->t('Search'));?> <?php p($l->t('Search'));?>