Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fixed gallery button insertion script and design fix #336

Merged
merged 7 commits into from
Jan 3, 2018

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Dec 13, 2017

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv added 3. to review Waiting for reviews bug Something isn't working design Related to the design regression Regression of a previous working feature labels Dec 13, 2017
@skjnldsv skjnldsv added this to the Nextcloud 13 milestone Dec 13, 2017
@skjnldsv skjnldsv self-assigned this Dec 13, 2017
@MorrisJobke
Copy link
Member

The gallery controls look still a bit weird:

bildschirmfoto 2017-12-13 um 12 16 48

@skjnldsv
Copy link
Member Author

Ouuuups, let me fix it

@oparoz
Copy link
Member

oparoz commented Dec 13, 2017

When testing, it's important to also try with public shares as the layout is completely different.

Copy link
Contributor

@pixelipo pixelipo left a comment

Choose a reason for hiding this comment

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

I think this needs more work - I'll add notes in a separate comment

@pixelipo
Copy link
Contributor

pixelipo commented Dec 13, 2017

3 issues visible here:
image

  • folder breadcrumb is not in line with the rest
  • some icons not in line with the rest
  • icons in right container are not pushed to the right edge (flex is needed here as well plus something to account for no sidebar...)
  • It's even worse (but not visible here) once the loader is on:
    screenshot from 2017-12-13 13-15-30

In general, button in that controls bar seem to each have their own CSS ruleset. It would be nice to get them to work with as little custom css as possible

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Copy link
Member Author

dev skjnldsv com_40402_apps_gallery_
Fixed a lot, please re-test @pixelipo :)

Copy link
Contributor

@pixelipo pixelipo left a comment

Choose a reason for hiding this comment

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

Looks better for logged in user, but:

  • breadscrumbs folders are still not vertically aligned
  • buttons are 40x36px (shouldn't they be squared?)
  • #controls is 44px high, so margin-top for buttons should be 4px (or 2px if we go for 40x40 square buttons)
  • public view looks like crap:
    image

@@ -29,8 +29,12 @@ div.crumb.last a {
width: 40px;
}

#controls > .right {
float: right;
#controls .button:not(:last-child) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this should go to nextcloud/server#7478

Copy link
Member Author

Choose a reason for hiding this comment

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

Gallery uses a lot of similar styles but does not includes any of them (yes, we need to rebuild the entire app), therefor, there are a lot of multiples files/properties used.

Copy link
Contributor

Choose a reason for hiding this comment

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

😢

@skjnldsv
Copy link
Member Author

#controls is 44px high, so margin-top for buttons should be 4px (or 2px if we go for 40x40 square buttons)

Buttons are always 44x44 on nextcloud! :)
I'll fix it asap

@pixelipo
Copy link
Contributor

@skjnldsv be careful with 44x44 - it means we also need to make #controls {height: 50px} and #controls button {margin-top: 3px) - so that's a commit for nextcloud/server#7374

@skjnldsv
Copy link
Member Author

Well, I guess it won't be 44x44 then! I don't want to try and break everything! :O
😭

@pixelipo
Copy link
Contributor

@skjnldsv ok, I've created a new issue for that: nextcloud/server#7481

@skjnldsv
Copy link
Member Author

breadscrumbs folders are still not vertically aligned

What do you mean by that?

@pixelipo
Copy link
Contributor

@skjnldsv look here - folder breadcrumb is 2px lower than the rest:
screenshot from 2017-12-13 15-19-57

@skjnldsv
Copy link
Member Author

@pixelipo And it's the opposite on the files app, the buttons are 2px lower...

@pixelipo
Copy link
Contributor

@skjnldsv that problem would be solved with proper button size and margins

@oparoz
Copy link
Member

oparoz commented Dec 13, 2017

@pixelipo the gallery app doesn't even use the new breadcrumbs system

Very true, by design apps should never rely on components delivered in the server, which is annoying.

@MorrisJobke
Copy link
Member

I pushed a fix to this branch to properly work with nextcloud/server#7484 this is now good to be merged. 👍

@MorrisJobke
Copy link
Member

breadscrumbs folders are still not vertically aligned

Let's skip this for this PR.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member

I didn't had the second commit from @skjnldsv (27f4c4e) - with this the file switcher is now misplaced. Without that commit it is properly shown.

@pixelipo
Copy link
Contributor

@MorrisJobke I'll make another PR in a second

Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
css/styles.css Outdated
@@ -20,16 +17,19 @@ body:after {
transition: transform .1s ease-in;
}

div.crumb.last a {
cursor: default;
/* Two ugly hacks to fix breadcrumbs in Gallery */
Copy link
Member Author

@skjnldsv skjnldsv Dec 20, 2017

Choose a reason for hiding this comment

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

Shouldn't this go in the gallery then? :)

EDIT: wrong pr, we are in the gallery 🙈 😆

Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
@pixelipo
Copy link
Contributor

pixelipo commented Dec 20, 2017

That was last commit from me - it fixes public view. Before:
image

After:
image

Please review

@skjnldsv
Copy link
Member Author

@pixelipo you're awesome! Perfect here!

Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
@pixelipo
Copy link
Contributor

Sorry, I lied - I found out that my "ugly hack" was causing a bug when only "Home" is the only breadcrumb. I've fixed it now, with the downside (which cannot be fixed without total rewrite of Gallery breadcrumbs) is that in case ellipsis is the last breadcrumb, it doesn't have the expected margin-right.

Good:
image

Still good:
image

Bad:
image

I guess we can live with that for now ;)

Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
@pixelipo
Copy link
Contributor

pixelipo commented Dec 20, 2017

My last (no, really) commit fixes the hover inconsistency issue mentioned by @MariusBluem in the nextcloud/server#7374

@skjnldsv
Copy link
Member Author

Another bump here?

@pixelipo
Copy link
Contributor

@skjnldsv travis-ci is failing:

1) ConnectWithTokenCest: Make sure i can get the thumbails
 Test  tests/api/ConnectWithTokenCest.php:connectToThumbnails
 Step  See response contains ""fileid":"274","status":200"
 Fail  REST response contains
Failed asserting that 'event: preview
data: {"preview":null,"mimetype":"application\/postscript","fileid":"274","status":500}

@oparoz
Copy link
Member

oparoz commented Dec 22, 2017

@skjnldsv travis-ci is failing:

Unrelated. I still haven't found the time to trace the regression. Could have been broken by a change in the server. There is an issue opened about it.

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 3, 2018

@MorrisJobke @rullzer A review here? 🙏

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 3639b62 into master Jan 3, 2018
@MorrisJobke MorrisJobke deleted the gallery-button-insertion-fix branch January 3, 2018 15:26
@MorrisJobke
Copy link
Member

@skjnldsv @pixelipo @oparoz Does the gallery app now only support 13+ or is this still working with 12 and before? I'm asking because otherwise the info.xml needs to be updated to not publish not-working apps in the appstore.

@skjnldsv
Copy link
Member Author

skjnldsv commented Jan 3, 2018

13+ I think. We need to test on stable12.

@danxuliu
Copy link
Member

danxuliu commented Jan 4, 2018

Does the gallery app now only support 13+ or is this still working with 12 and before?

Even if this pull request worked on 12 (and I made a quick check and there seems to be some issues) due to #331 the slideshow icons are not visible on a black background on Nextcloud 12:
gallery-slideshow-buttons

@rullzer
Copy link
Member

rullzer commented Jan 4, 2018

Ok lets bump to 13 only then we have the stable branches anyways

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
3. to review Waiting for reviews bug Something isn't working design Related to the design regression Regression of a previous working feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants