Skip to content

Fixed breadcrumbs calculation and actions flow - #7478

Merged
skjnldsv merged 7 commits into
masterfrom
breadcrumbs-buttons-fixes-gallery
Dec 22, 2017
Merged

Fixed breadcrumbs calculation and actions flow#7478
skjnldsv merged 7 commits into
masterfrom
breadcrumbs-buttons-fixes-gallery

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Dec 13, 2017•
edited
Loading

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added 3. to review Waiting for reviews bug design Design, UI, UX, etc. medium regression labels Dec 13, 2017
@skjnldsvskjnldsv added this to the Nextcloud 13 milestone Dec 13, 2017
@skjnldsvskjnldsv self-assigned this Dec 13, 2017
This was referenced Dec 13, 2017
Merged
Closed
@MorrisJobke

MorrisJobke commented Dec 13, 2017

Copy link
Copy Markdown
Member

In the files app the gallery button is not pushed to the left anymore once you open the sidebar. In the past the button was moved to the left of the sidebar once it was opened. This may be crucial in the future once the sidebar is open per default for wide screens.

pixelipo
pixelipo approved these changes Dec 13, 2017
View reviewed changes

@pixelipopixelipo left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly how it should be solved (few CSS nitpicks aside)

Some work is needed in the gallery app PR.

Comment threadapps/files/css/files.scss
@@ -21,6 +21,11 @@
.actions.creatable {
position: relative;

@pixelipopixelipoDec 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't need this anymore.

Comment threadapps/files/css/files.scss
display: flex;
flex: 1 1;
.button:not(:last-child) {
margin-right: 3px;

@pixelipopixelipoDec 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason for this? AFAICS, it's only applies to button.new, which doesn't need it (#uploadprogresswrapper already has a left margin).

@skjnldsvskjnldsvDec 13, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in case of other apps want to add their buttons, let them do it without needing to define specific margins :)

@pixelipopixelipoDec 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, but then you can remove the margin from #uploadprogresswrapper

@pixelipopixelipoDec 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, it should be #controls .button, not .actions.createable

@skjnldsvskjnldsvDec 13, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All buttons should be in the .actions div now. Far better thann having buttons everywhere :)

@pixelipopixelipoDec 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps, but definitely not in .createable ;)

@pixelipopixelipo mentioned this pull request Dec 13, 2017
Merged
@pixelipo

pixelipo commented Dec 13, 2017

Copy link
Copy Markdown
Contributor

Should @MorrisJobke 's issue be fixed in this PR as well? I'm made a PR to this branch with a proposed solution to it: #7484

MorrisJobke
MorrisJobke approved these changes Dec 20, 2017
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Together with #7484 this works fine 👍

skjnldsvand others added 6 commits December 20, 2017 13:48
@skjnldsv
Fixed breadcrumbs calculation and actions flow
7a9e65c
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@pixelipo@skjnldsv
Dynamic control bar width
228ca16
Signed-off-by: Marin Treselj <marin@pixelipo.com>
@pixelipo@skjnldsv
Make contorls stick to the top when scrolling
eebc70c
Signed-off-by: Marin Treselj <marin@pixelipo.com>
@MorrisJobke@skjnldsv
Properly show action icons
9e6f956
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke@skjnldsv
Add the webkit sticky position prefix
0fef608
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@skjnldsv
zindex fix
3105a27
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the breadcrumbs-buttons-fixes-gallery branch from 8941bf3 to 3105a27CompareDecember 20, 2017 12:50
@codecov

codecovBot commented Dec 20, 2017•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #7478 into master will not change coverage.
The diff coverage is n/a.

@@ Coverage Diff @@## master #7478 +/- ##
=========================================
Coverage 51.17% 51.17% Complexity 24886 24886 =========================================
Files 1602 1602 Lines 94750 94750 Branches 1368 1368 =========================================
Hits 48486 48486 Misses 46264 46264
Impacted FilesCoverage ΔComplexity Δ
lib/private/Files/Cache/Propagator.php94.93% <0%> (-1.27%)16% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php72.53% <0%> (+0.24%)136% <0%> (ø)⬇️

@skjnldsv

skjnldsv commented Dec 20, 2017

Copy link
Copy Markdown
MemberAuthor

Okay, fixed zindex, rebased and seems fine! :)

@skjnldsv
Fixed breadcrumbs tests
8cc90ab
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv

skjnldsv commented Dec 21, 2017•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Test fixed! There was an issue from #7051.... The test was basically useless ^^

We need to test the tests 😆

EDIT: tests passed! 🎉
PhantomJS 2.1.1 (Linux 0.0.0): Executed 1001 of 1003 (skipped 2) SUCCESS (26.416 secs / 25.362 secs)

@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 21, 2017
@skjnldsv
skjnldsv merged commit d0e7b0d into masterDec 22, 2017
@skjnldsv
skjnldsv deleted the breadcrumbs-buttons-fixes-gallery branch December 22, 2017 08:11
@danxuliudanxuliu mentioned this pull request Dec 26, 2017
Closed
@MorrisJobkeMorrisJobke mentioned this pull request Jan 2, 2018
Merged
30 tasks
This was referenced Feb 4, 2022
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pixelipopixelipopixelipo approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@oparozoparozAwaiting requested review from oparoz
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@MariusBluemMariusBluemAwaiting requested review from MariusBluem

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugdesignDesign, UI, UX, etc.mediumregression

Projects

None yet

Milestone

Nextcloud 13

Development

Successfully merging this pull request may close these issues.

3 participants

@skjnldsv@MorrisJobke@pixelipo