Skip to content
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

Jump to bottom

Styling tweaks for share indicators and indirect share entries #2940

Merged
merged 6 commits into from
Jan 31, 2020
Merged

Styling tweaks for share indicators and indirect share entries #2940

merged 6 commits into from
Jan 31, 2020

Conversation

PVince81
Copy link
Contributor

@PVince81 PVince81 commented Jan 30, 2020 •
edited
Loading

Description

Related Issue

Motivation and Context

See #2938

How Has This Been Tested?

  • manual test in web UI
  • acceptance tests

Screenshots (if appropriate):

Share indicators alignment

image

Indirect shares

  • Reshare/via are now respectively on the top/bottom.
  • Removed section headers
  • No more lock icon but empty space instead
    image

image

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • update changelog to mention this PR ?

@PVince81 PVince81 requested a review from kulmann January 30, 2020 17:01
@PVince81 PVince81 self-assigned this Jan 30, 2020
@PVince81 PVince81 mentioned this pull request Jan 30, 2020
Closed
4 tasks
Vincent Petry added 5 commits January 30, 2020 20:34
Align collaborator avatar size
07d6bd9 
The oc-icon size for the group and person icons is 48px.
This fix changes the avatar size from 50px to 48px to make sure all are
properly aligned in both the collaborators list and the autocomplete
items.
Remove section headers in collaborators and links panels
a1bc114 
Remove the section headers in the collaborators and link share panels
and adjusted the divider lines to be consistent across the sections.
Hide lock icon in collaborators and link share lists
bbf2571 
The lock icon felt redundant so it is now made invisible to keep the
layout and alignment with other entries that display a delete icon.
Adjust reshare and via information in share rows
1dabd8f 
Move the via label to the bottom of the collaborator and link row.
For collaborators, the reshare information still appears on top.
Keep share indicator position in file list
6b96846 
Collaborator and link share indicators in the file list are now always
staying in their own "column" or position instead of following each
other.

This is achieved by always rendering the indicator but hiding it with
uk-invisible to keep the empty space's size.
@PVince81
Copy link
Contributor Author

Rebased

@PVince81 PVince81 marked this pull request as ready for review January 30, 2020 19:43
@PVince81 PVince81 merged commit 6f62fcd into master Jan 31, 2020
@delete-merged-branch delete-merged-branch bot deleted the share-indirect-after-review branch January 31, 2020 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kulmann kulmann kulmann approved these changes

@DeepDiver1975 DeepDiver1975 Awaiting requested review from DeepDiver1975

Assignees

@PVince81 PVince81

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Indirect shares + owner review feedback
2 participants
@PVince81 @kulmann