Skip to content

Header fixes and public note #10838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 8 commits into from
Aug 24, 2018
Merged

Header fixes and public note #10838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cb52b8
Fix header calculation and better public design
skjnldsv Aug 24, 2018
ac2c925
Fix mobile view and add public share note view
skjnldsv Aug 24, 2018
ddd18aa
Fix public link order and fix skip to content
skjnldsv Aug 24, 2018
fb40627
Fix header logo padding
juliusknorr Aug 24, 2018
421daf6
Fix public share link order
skjnldsv Aug 24, 2018
03b112c
Merge branch 'header-fixes-and-public-note' of https://github.com/nex…
skjnldsv Aug 24, 2018
719f928
Tests fixes
skjnldsv Aug 24, 2018
13230f1
Fix jsunit
skjnldsv Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix header calculation and better public design 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Aug 24, 2018
commit 3cb52b868a0eba7bdfb6a03fed24447873735dd6
15 changes: 12 additions & 3 deletions apps/files_sharing/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,26 @@ thead {
}

#header .header-shared-by {
display: inline-block;
color: var(--color-primary-text);
position: relative;
top: -10px;
font-weight: 300;
font-size: 11px;
opacity: .57;
margin-top: 10px;
}

#note {
text-align: center;
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;
}
}
}
}
27 changes: 12 additions & 15 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,15 @@

/* LOGO and APP NAME -------------------------------------------------------- */
#nextcloud {
padding: 8px 12px;
padding: 7px 12px;
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;
}
Expand Down Expand Up @@ -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;
Expand All @@ -121,10 +124,8 @@
}
}

}
.header-appname-container {
display: none;
padding-top: 22px;
padding-right: 10px;
flex-shrink: 0;
}
Expand Down Expand Up @@ -153,7 +154,6 @@

#header-right, .header-right {
justify-content: flex-end;
flex-basis: 210px;
flex-shrink: 1;
}

Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion core/js/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,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();
Expand Down