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.

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

Shared with action menu label alignment #9324

Closed
wants to merge 209 commits into from

Conversation

koebel
Copy link
Contributor

@koebel koebel commented Jun 30, 2023

Description

Previously in the label of the option "set expiration date" and “edit expiration date” for resources in the Shares sidebar was not in line. The same problem also applied to expiration date of members in Spaces. I removed the spacing between the icons and labels of the options below “set/edit expiration date” so that the design matches with the spacing of the same feature for sharing links.

Related Issue

Motivation and Context

Maintain consistent design in the UI

How Has This Been Tested?

inspecting HTML code output, manual testing in Chrome

Screenshots (if appropriate):

Design Reference for width of spacing
Screenshot_Shares_Add_Expiration_Date_Design_Reference

Shares after modification
Screenshot_Shares_Set_Expiration_Date_after_modification

Spaces after modification
Screenshot_Spaces_Set_Expiration_Date_after_modification

Types of changes

  • [x ] 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:

  • [x ] Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • ...

saw-jan and others added 20 commits June 16, 2023 11:13
* make proper use of waitForResponse

* refactor

* check file after copy,move action
#9254)

I've money-patched that for the release of tag v7.0.2 during the sign process.

Co-authored-by: Juergen Weigert <jnweiger@gmail.com>
…623-stable

[tests-only][full-ci]Bump commit id for tests
* Load common theme into store

* Implement url in access denied page

* Fix add return

* Add changelog

* Update/add unittests

* Update config.spec.ts

* Fix typo

* Rename accessDeniedHelpUrl

* Fix acceptance tests, remove dev leftover

* Rename more to readmore
Fixes uploading resources to folders that contain special characters in their names. This also includes fixes for name conflict handling when running oC10 as server.
…3c-stable

[tests-only][full-ci] Bump ocis commit id for tests
@koebel koebel added Status:Needs-Review Needs review from a maintainer Topic:UX-Design Category:Change Change existing functionality labels Jun 30, 2023
@koebel koebel requested a review from AlexAndBear June 30, 2023 10:07
@koebel koebel self-assigned this Jun 30, 2023
@sonarcloud
Copy link

sonarcloud bot commented Jun 30, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

Jan and others added 10 commits July 31, 2023 17:33
…ource is deleted or disabled (space) (#9502)

* Show error message while accessing a public link which originated resource is deleted or disabled (space)

* Rm new line
* bump latest ocis commit (#9476)

* [tx] updated from transifex

* chore: prepare release v7.1.0-rc.2

* chore: move changelog items back to unreleased

* fix: respect supportedClouds config

* test: add unit tests for cloud import action handler

* Initialize Drop Target after load time

* fix: logo not showing

* chore: prepare release v7.1.0-rc.3

* chore: move changelog items back to unreleased

* feat: add tx config for importer app

* feat: add missing cloud importer translations

* chore: bump owncloud uppy

---------

Co-authored-by: Karun Atreya <33852651+KarunAtreya@users.noreply.github.com>
Co-authored-by: ownClouders <devops@owncloud.com>
Co-authored-by: Phil Davis <phil@jankaritech.com>
Co-authored-by: Jacob Noah <jacob.noah.jnn@gmail.com>
* Use new spaces endpoint for search

* Bump sdk and ocis commit id

* Add spaces check
@JammingBen
Copy link
Collaborator

@koebel Do you still plan to rebase, or should we take care?

JammingBen and others added 2 commits August 2, 2023 13:57
Co-authored-by: Phil Davis <phil@jankaritech.com>
@koebel
Copy link
Contributor Author

koebel commented Aug 2, 2023

@JammingBen thanks for the reminder. I just rebased. Locally all tests passed, so I expect that CI will pass in a little moment :)

@JammingBen
Copy link
Collaborator

Hmm something is still off, the pipeline doesn't get past the first steps. Are you sure you rebased with current master? 😅 Not sure about the merge commit (4433ced), simply git rebase origin/master should do the trick.

@JammingBen
Copy link
Collaborator

Now there is something off completely, it shows 200+ commits 🙈 Don't know what happened here, probably the easiest way is to reset it:

git reset --hard origin/master
git cherry-pick 54bdd385bd7b4d19bb081e83e51caacc7e2fd165
git cherry-pick 5aa2d1bb106db1d1e68ebcb257bc1fc808b91462

@sonarcloud
Copy link

sonarcloud bot commented Aug 2, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@koebel
Copy link
Contributor Author

koebel commented Aug 2, 2023

Now there is something off completely, it shows 200+ commits 🙈 Don't know what happened here, probably the easiest way is to reset it:

git reset --hard origin/master
git cherry-pick 54bdd385bd7b4d19bb081e83e51caacc7e2fd165
git cherry-pick 5aa2d1bb106db1d1e68ebcb257bc1fc808b91462

thanks, it seems like it worked now

@JammingBen
Copy link
Collaborator

There is still something wrong:

image

It also still shows your merge commit which shouldn't be there anymore. Are you sure you ran the git commands correctly?

@koebel
Copy link
Contributor Author

koebel commented Aug 2, 2023

There is still something wrong:

image It also still shows [your merge commit](https://github.com//pull/9324/commits/06ccbeb2b4b04a446f1bd1e87bf5c9df01f32d74) which shouldn't be there anymore. Are you sure you ran the git commands correctly?

@JammingBen Thanks for your feedback, I don't know what exactly went wrong. There must have been a problem with the rebasing at some point because it shows all (or at least some) of the commits made by others since I created this PR several weeks ago upto now. My suggestion is to close this thread without merging and replicate the minor code changes in a new branch and create a new PR. I assume this takes less time than trying to reverse engineer what went wrong. Is this approach ok?

@koebel
Copy link
Contributor Author

koebel commented Aug 2, 2023

this PR is replaced by #9529

@JammingBen JammingBen closed this Aug 2, 2023
@koebel koebel deleted the shared-with-action-menu-label-alignment branch August 2, 2023 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Category:Change Change existing functionality Status:Needs-Review Needs review from a maintainer Topic:UX-Design
Projects
None yet
Development

Successfully merging this pull request may close these issues.

alignment of expiration date for shares