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

Remove obsolete/faulty css for the top right button #196

Merged
merged 3 commits into from
Aug 2, 2017

Conversation

eppfel
Copy link
Member

@eppfel eppfel commented Jan 22, 2017

Fixes wrong styling in files app and gallery due to new button styles in server nextcloud/server#3187

@eppfel eppfel added 3. to review Waiting for reviews bug Something isn't working design Related to the design labels Jan 22, 2017
@codecov-io
Copy link

codecov-io commented Jan 23, 2017

Codecov Report

Merging #196 into master will decrease coverage by 0.46%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #196      +/-   ##
============================================
- Coverage     82.39%   81.93%   -0.47%     
  Complexity      334      334              
============================================
  Files            38       38              
  Lines          1284     1284              
============================================
- Hits           1058     1052       -6     
- Misses          226      232       +6
Impacted Files Coverage Δ Complexity Δ
lib/Middleware/SharingCheckMiddleware.php 85% <0%> (-15%) 7% <0%> (ø)
lib/Middleware/EnvCheckMiddleware.php 89.39% <0%> (-4.55%) 24% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3d7b1d2...8074f5c. Read the comment docs.

@skjnldsv
Copy link
Member

Could you use a span and apply the icon through css instead?
Like the other buttons on the files?

I would like to unify the alignment of icons inside buttons in core :)

@eppfel
Copy link
Member Author

eppfel commented Jan 24, 2017

@skjnldsv Feel free to hijack this...

@skjnldsv
Copy link
Member

@eppfel sorry, here you go :)
We should test it in nc11.

@skjnldsv skjnldsv force-pushed the change-button-to-new-style branch from 08391e0 to f51367e Compare January 24, 2017 11:26
'<img class="svg" src="' + OC.imagePath('core', 'actions/toggle-pictures.svg') +
'"' +
'alt="' + t('gallery', 'Gallery view') + '"/>' +
'<span class="icon-toggle-pictures"></span>' +
Copy link
Member

Choose a reason for hiding this comment

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

Is there a way to keep the alternative text for the icon?

Copy link
Member

Choose a reason for hiding this comment

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

With title?

Copy link
Member

Choose a reason for hiding this comment

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

It currently says "Gallery view", letting people know what the button is for. It's also an accessibility thing if I'm not mistaken.

Copy link
Member

Choose a reason for hiding this comment

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

Alt is in case of the image isn't loaded indeed. With title we should be able to have a popup. That's how we do on the other apps on nextcloud I think. There isn't any icons used as direct image (not that I'm aware of at least) :)

Copy link
Member

Choose a reason for hiding this comment

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

Just tested on Files and seems all of these are gone anyway, so if @jancborchardt is OK with this, it can be merged.

@jancborchardt
Copy link
Member

Can you post a before/after screenshot? Not sure what the issue is.

It is intentional that the switch to Gallery in the top right of files does not have a border.

@oparoz oparoz added this to the Nextcloud 12.0 milestone Mar 11, 2017
@MorrisJobke
Copy link
Member

@eppfel What is the status of this? Could you show what is broken and what does this fix to evaluate if we need to ship this with 12. I would like to move this to 13.

@eppfel eppfel force-pushed the change-button-to-new-style branch from f51367e to e0fafce Compare May 21, 2017 17:40
@eppfel
Copy link
Member Author

eppfel commented May 21, 2017

Before:
bildschirmfoto 2017-05-21 um 19 39 02
After:
bildschirmfoto 2017-05-21 um 19 38 17

@eppfel
Copy link
Member Author

eppfel commented May 21, 2017

Wait.. now the icon greyvalue is off... @skjnldsv to the rescue!

eppfel and others added 2 commits July 27, 2017 16:38
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
@MorrisJobke MorrisJobke force-pushed the change-button-to-new-style branch from e0fafce to 523d282 Compare July 27, 2017 14:39
@MorrisJobke
Copy link
Member

Rebased

@MorrisJobke
Copy link
Member

BTW: I'm currently fixing all of this here 😉

@MorrisJobke
Copy link
Member

Okay I adjusted:

  • the loading icon is now not weirdly overlayed anymore on the switcher between files and gallery and it is the small version:

bildschirmfoto 2017-07-27 um 17 17 33

  • all buttons are now grey (as in server) and on hover only have the blue border (like in server) - instead of the white background on hover and active state - they also now use the servers active class

bildschirmfoto 2017-07-27 um 17 17 39

  • the position of the icon inside of the button is also properly centered now:

bildschirmfoto 2017-07-27 um 17 18 29

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.

👍

@MorrisJobke
Copy link
Member

And this should be backported to the stable12 branch.

@MorrisJobke MorrisJobke added the backport-request Pending backport by the backport-bot label Jul 27, 2017
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks good! What about the Travis failure?

@oparoz
Copy link
Member

oparoz commented Aug 2, 2017

Looks good! What about the Travis failure?

Someone needs to adjust the acceptance test to work with the new menu introduced in 12.
https://github.com/nextcloud/gallery/blob/master/tests/acceptance/SignInAsUserCept.php#L28 requires this to be correct
https://github.com/nextcloud/gallery/blob/master/tests/_support/Page/Gallery.php#L20

@oparoz oparoz merged commit 484b964 into master Aug 2, 2017
@oparoz oparoz deleted the change-button-to-new-style branch August 2, 2017 13:30
@MorrisJobke MorrisJobke removed the backport-request Pending backport by the backport-bot label Mar 9, 2018
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants