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

Fix "delete" modal dialog for issue/PR #27015

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Fix "delete" modal dialog for issue/PR #27015

merged 2 commits into from
Sep 11, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Sep 11, 2023 •
edited
Loading

Close #27012

By the way, rename the single-word ID to a long ID.

image

image

@wxiaoguang wxiaoguang added type/bug topic/ui Change the appearance of the Gitea UI skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Sep 11, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Sep 11, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 11, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 11, 2023
@wxiaoguang wxiaoguang mentioned this pull request Sep 11, 2023
Closed
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 11, 2023
silverwind
silverwind reviewed Sep 11, 2023
View reviewed changes
web_src/css/modules/modal.css
@@ -47,7 +48,8 @@ These inconsistent layouts should be refactored to simple ones.
}

.ui.modal > .actions,
.ui.modal .content + .actions {
.ui.modal .content + .actions,
.ui.modal .content + form > .actions {
Copy link
Member

@silverwind silverwind Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Are these fomantic's selectors or our own? If our own, maybe we can simplify.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image

Copy link
Member

@silverwind silverwind Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I see, well it could be simplified to .content .actions or even .ui.modal .actions, but leaving that up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do not feel it is safe to use content or actions without a strict rule. It would cause pollution because many one-word classes (including "content") have been used everywhere.

Copy link
Contributor Author

@wxiaoguang wxiaoguang Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Another (strong) reason is that the content itself has paddings, so the actions inside it shouldn't have padding again. But the actions following it should still have the padding. Line 60 comment: /* if the "actions" is in the "content", some paddings are already added by the "content" */

Declaring these style explicitly is good for maintainability.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 11, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 11, 2023
@silverwind silverwind enabled auto-merge (squash) September 11, 2023 16:35
@silverwind silverwind merged commit 1875362 into go-gitea:main Sep 11, 2023
25 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 11, 2023
@wxiaoguang wxiaoguang deleted the fix-modal branch September 11, 2023 23:07
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 12, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
85b3127 
* upstream/main:
  Add more package registry paths to the labeler (go-gitea#27032)
  Extract auth middleware from service (go-gitea#27028)
  S3: log human readable error on connection failure (go-gitea#26856)
  [skip ci] Updated translations via Crowdin
  Fix "delete" modal dialog for issue/PR (go-gitea#27015)
  Fix context cache bug & enable context cache for dashabord commits' authors (go-gitea#26991)
  fix: typo (go-gitea#27009)
  Use secure cookie for HTTPS sites (go-gitea#26999)
  Add fetch wrappers, ignore network errors in actions view (go-gitea#26985)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Delete pull request popup missing margin
4 participants
@wxiaoguang @lunny @silverwind @GiteaBot