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
Fix indication of the quota consumed #2244
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Jerome,
thanks for trying to fix issue #2276!
There are a few changes in this PR that aren't actually needed and some changes would be better suited on other parts.
See my review :)
Hi @koelle25 ! |
What it renders now 👍 @koelle25 |
@susnux it should be OK now. |
@icewind1991 @juliushaertl this PR should make GF admin UI "great again" 😅 |
@Jerome-Herbinet Thanks for that. Could you maybe squash your commits into one? |
9d4ed68
to
d29e8b9
Compare
Will a "npm run sass" be necessary ? |
Not in this repo. Looks good now. Regarding squashing, a descriptive commit message would still be nice as this makes it easier to follow changes that happened later on. Maybe you can just give it a message like "Fix indication of the quota consumed" as the PR title. |
2fb6b7b
to
6bfebc8
Compare
I've tried to add comment, but I'm not sure if it worked, can you confirm ? |
It is part of the commit message but the most important one would be the first line as that is what you usually see in git log and the GitHub web ui. Maybe you can just replace the commit message with a fresh one with |
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Fix indication of the quota consumed Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Adding a missing property Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Following Koelle25 suggestion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
I think it's OK now. |
Perfect, looks good now. Thanks a lot. |
And thanks also @koelle25 :-) |
/backport to stable26 |
/backport to stable25 |
/backport to stable24 |
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24 More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
After the update to 13.1.2 there now is an indicator but it looks wrong… Changing the settings in the Inspector to But there are still issues with a "0" quota which appears when the element width is very small. So groupfolders/src/settings/EditSelect.scss Lines 34 to 42 in 0908148
Should look like .quotabar {
margin: 3px 0;
border-radius: var(--border-radius-large);
background-color: var(--color-loading-light);
height: 34px;
} Sorry a have almost no clue about css 😅 Should I open a new issue & pull request? |
Yeah, it seems NC 25.0.5 brought another few changes which messed this up again 😮💨 On 25.0.4 it was working fine 😅 Your proposal looks fine @q-wertz , though I maybe would rather use Separate issue I just noticed: The extended permissions field is not readable anymore due to a wrong text color it seems: I will open an issue for the second issue. @q-wertz I leave the honor of creating a new issue regarding the quota bar to you 🙂 |
@koelle25 Thanks for your help :) Opened an issue. Regarding the color I had the problem that with |
@koelle25 did you finally create an issue concerning ACL appearance ? If yes, I'd like to link my new PR to it (#2342) |
@Jerome-Herbinet Yes, it is here: #2331 |
Signed-off-by: Jérôme Herbinet 33763786+Jerome-Herbinet@users.noreply.github.com
Signed-off-by: Jérôme Herbinet 33763786+Jerome-Herbinet@users.noreply.github.com
Before :
After :