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

Fix indication of the quota consumed #2244

Merged
merged 1 commit into from Apr 5, 2023

Conversation

Jerome-Herbinet
Copy link
Member

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 :
2023-01-30_13-08_1

After :
2023-01-30_13-08

@susnux
Copy link
Contributor

susnux commented Feb 4, 2023

This does not work for me, for me it does the opposite: it breaks the quota bars. On NC 26 beta 2 this looks like this:

Before (current master) After (this PR)
quota with bars quota not visible

@Jerome-Herbinet
Copy link
Member Author

This does not work for me, for me it does the opposite: it breaks the quota bars. On NC 26 beta 2 this looks like this:
Before (current master) After (this PR)
quota with bars quota not visible

Hmmmm, strange, I've made some new test, and it's not breaking the UI. But I've noticed a missing property to let appear the background color of used quota (now fixed in a 2nd commit).

Copy link

@koelle25 koelle25 left a 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 :)

src/settings/EditSelect.scss Outdated Show resolved Hide resolved
src/settings/EditSelect.scss Outdated Show resolved Hide resolved
src/settings/EditSelect.scss Outdated Show resolved Hide resolved
src/settings/EditSelect.scss Outdated Show resolved Hide resolved
src/settings/EditSelect.scss Outdated Show resolved Hide resolved
src/settings/EditSelect.scss Outdated Show resolved Hide resolved
@Jerome-Herbinet
Copy link
Member Author

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 !
Thank you very much for your review.
I've followed all your suggestions.
I let you check if it's OK for you.
I remain at your disposal.
Bests regards,
Jérôme

@Jerome-Herbinet
Copy link
Member Author

What it renders now 👍 @koelle25
2023-03-30_11-09_1

@Jerome-Herbinet
Copy link
Member Author

@susnux it should be OK now.

@Jerome-Herbinet
Copy link
Member Author

@icewind1991 @juliushaertl this PR should make GF admin UI "great again" 😅

@juliushaertl
Copy link
Member

@Jerome-Herbinet Thanks for that. Could you maybe squash your commits into one?

@Jerome-Herbinet
Copy link
Member Author

Will a "npm run sass" be necessary ?

@juliushaertl
Copy link
Member

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.

@Jerome-Herbinet
Copy link
Member Author

I've tried to add comment, but I'm not sure if it worked, can you confirm ?

@juliushaertl
Copy link
Member

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 git commit --amend

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>
@Jerome-Herbinet
Copy link
Member Author

I think it's OK now.

@juliushaertl
Copy link
Member

Perfect, looks good now. Thanks a lot.

@Jerome-Herbinet
Copy link
Member Author

And thanks also @koelle25 :-)

@juliushaertl juliushaertl merged commit a43af02 into nextcloud:master Apr 5, 2023
8 checks passed
@juliushaertl
Copy link
Member

/backport to stable26

@juliushaertl
Copy link
Member

/backport to stable25

@juliushaertl
Copy link
Member

/backport to stable24

@backportbot-nextcloud
Copy link

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

@q-wertz
Copy link

q-wertz commented Apr 13, 2023

After the update to 13.1.2 there now is an indicator but it looks wrong…
(NC25.0.5)
image

Changing the settings in the Inspector to
image
kind of worked
image

But there are still issues with a "0" quota which appears when the element width is very small.

So

.quotabar {
position: absolute;
margin: 3px 0;
border-radius: var(--border-radius-large);
top: -7px;
left: 0;
background-color: var(--color-loading-dark);
height: 3px;
}

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 😅
But why is the positioning relative?

Should I open a new issue & pull request?

@koelle25
Copy link

koelle25 commented Apr 14, 2023

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 background-color: var(--color-background-dark); like it is used in the extended permissions field.

Separate issue I just noticed: The extended permissions field is not readable anymore due to a wrong text color it seems:
2023-04-14_10-41

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 🙂

@q-wertz
Copy link

q-wertz commented Apr 14, 2023

@koelle25 Thanks for your help :)

Opened an issue. Regarding the color I had the problem that with --color-background-dark the text become unreadable, that's why I switched it… 😅

@Jerome-Herbinet
Copy link
Member Author

Yeah, it seems NC 25.0.5 brought another few changes which messed this up again face_exhaling On 25.0.4 it was working fine sweat_smile

Your proposal looks fine @q-wertz , though I maybe would rather use background-color: var(--color-background-dark); like it is used in the extended permissions field.

Separate issue I just noticed: The extended permissions field is not readable anymore due to a wrong text color it seems: 2023-04-14_10-41

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 slightly_smiling_face

@koelle25 did you finally create an issue concerning ACL appearance ? If yes, I'd like to link my new PR to it (#2342)

@koelle25
Copy link

@Jerome-Herbinet Yes, it is here: #2331

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants