Fix header calculation and better public design

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/10838/head
John Molakvoæ (skjnldsv) 2018-08-24 15:45:39 +07:00
parent e27817aeda
commit 3cb52b868a
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
3 changed files with 25 additions and 19 deletions

@ -160,17 +160,26 @@ thead {
} }
#header .header-shared-by { #header .header-shared-by {
display: inline-block;
color: var(--color-primary-text); color: var(--color-primary-text);
position: relative; position: relative;
top: -10px;
font-weight: 300; font-weight: 300;
font-size: 11px; font-size: 11px;
opacity: .57; opacity: .57;
margin-top: 10px;
} }
#note { #note {
text-align: center; text-align: center;
padding: 10px; padding: 10px;
} }
// hide the primary on public share on mobile
@media only screen and (max-width: 768px) {
#body-public {
.header-right {
#header-primary-action {
display: none;
}
}
}
}

@ -56,10 +56,15 @@
/* LOGO and APP NAME -------------------------------------------------------- */ /* LOGO and APP NAME -------------------------------------------------------- */
#nextcloud { #nextcloud {
padding: 8px 12px; padding: 7px 12px;
padding-left: 86px; // logo width + 2* pa
position: relative;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
opacity: 1; opacity: 1;
display: flex;
align-items: center;
flex-wrap: wrap;
&:focus { &:focus {
opacity: .75; opacity: .75;
} }
@ -107,12 +112,10 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
background-position: center; background-position: center;
width: 256px; width: 62px;
height: 128px; height: 100%;
margin: 0 auto; position: absolute;
&.logo-icon { left: 12px;
width: 62px;
height: 34px;
img { img {
opacity: 0; opacity: 0;
@ -121,10 +124,8 @@
} }
} }
}
.header-appname-container { .header-appname-container {
display: none; display: none;
padding-top: 22px;
padding-right: 10px; padding-right: 10px;
flex-shrink: 0; flex-shrink: 0;
} }
@ -153,7 +154,6 @@
#header-right, .header-right { #header-right, .header-right {
justify-content: flex-end; justify-content: flex-end;
flex-basis: 210px;
flex-shrink: 1; flex-shrink: 1;
} }
@ -207,15 +207,12 @@
/* show appname next to logo */ /* show appname next to logo */
.header-appname { .header-appname {
display: inline-block;
position: relative;
color: var(--color-primary-text); color: var(--color-primary-text);
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
margin: 0; margin: 0;
margin-top: -26px; padding: 0;
padding: 7px 0 7px 5px; padding-right: 5px;
vertical-align: middle;
} }
/* do not show menu toggle on public share links as there is no menu */ /* do not show menu toggle on public share links as there is no menu */

@ -1566,7 +1566,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').outerWidth() - $('#nextcloud').outerWidth();
var usePercentualAppMenuLimit = 0.33; var usePercentualAppMenuLimit = 0.33;
var minAppsDesktop = 8; var minAppsDesktop = 8;
var availableWidth = headerWidth - $(appList).width(); var availableWidth = headerWidth - $(appList).width();