Fix the spacing issue in the Project view #30415

HEREYUA · 2024-04-11T09:37:48Z

Fixes: #30388

before

after

silverwind

Could also add class it to parent node I suppose. Such wrapper divs should be avoided where possible.

silverwind · 2024-04-11T11:53:12Z

Wait a bit on comment above.

HEREYUA · 2024-04-11T12:16:20Z

Okay, I noticed that there were several other similar usages, so I added margins this way.

gitea/templates/org/projects/list.tmpl

Lines 17 to 19 in 0fe9f93

    
           <div class="tw-mb-4"> 
        
           	{{template "user/overview/header" .}} 
        
           </div>

gitea/templates/user/profile.tmpl

Lines 9 to 11 in 0fe9f93

    
           <div class="tw-mb-4"> 
        
           	{{template "user/overview/header" .}} 
        
           </div>

gitea/templates/user/overview/package_versions.tmpl

Lines 17 to 19 in 0fe9f93

    
           <div class="tw-mb-4"> 
        
           	{{template "user/overview/header" .}} 
        
           </div>

gitea/templates/user/overview/packages.tmpl

Lines 17 to 20 in 0fe9f93

    
           <div class="tw-mb-4"> 
        
           	{{template "user/overview/header" .}} 
        
           </div> 
        
           {{template "package/shared/list" .}}

Should all of the above be changed?

silverwind · 2024-04-11T12:33:36Z

Yes, I would recommend adding the helper class on the existing parent in all cases.

HEREYUA · 2024-04-11T12:40:04Z

Yes, I would recommend adding the helper class on the existing parent in all cases.

Updated

**fix**: [go-gitea#30388](go-gitea#30388) **before** ![image](https://github.com/go-gitea/gitea/assets/37935145/52ca7311-dca4-4430-9a37-3c45b08fe3dd) **after** ![image](https://github.com/go-gitea/gitea/assets/37935145/6b75ce69-4423-4ea4-99a1-d7234287c5c0)

* giteaofficial/main: Change the default maxPerPage for gitbucket (go-gitea#30392) Fix the spacing issue in the Project view (go-gitea#30415) Add commit status summary table to reduce query from commit status table (go-gitea#30223) Split `issue edit` code from `repo-legacy.js` into its own file (go-gitea#30419) Check the token's owner and repository when registering a runner (go-gitea#30406) Avoid user does not exist error when detecting schedule actions when the commit author is an external user (go-gitea#30357) Update actions variables documents (go-gitea#30394) Fix author name alignment in commits table (go-gitea#30396)

@HEREYUA

Backport #30415 by @HEREYUA **fix**: [#30388](#30388) **before** ![image](https://github.com/go-gitea/gitea/assets/37935145/52ca7311-dca4-4430-9a37-3c45b08fe3dd) **after** ![image](https://github.com/go-gitea/gitea/assets/37935145/6b75ce69-4423-4ea4-99a1-d7234287c5c0) Co-authored-by: HEREYUA <[email protected]>

yp05327 · 2024-04-12T12:50:27Z

@HEREYUA @lunny
Didn't link to the issue correctly. Can you fix the description?

silverwind · 2024-04-12T13:09:22Z

Likely because GitHub couldn't parse this correctly:

**fix**:  [#30388](https://github.com/go-gitea/gitea/issues/30388)

I recommend using Fixes: <link> instead.

HEREYUA · 2024-04-12T13:26:52Z

updated

silverwind · 2024-04-12T13:32:11Z

Always use absolute links instead of #1234 because those will not work if the repo is hosted somewhere else than GitHub. I edited just for the sake of correctness:

Fixes: https://github.com/go-gitea/gitea/issues/30388

* origin/main: (1540 commits) Add `interface{}` to `any` replacement to `make fmt`, exclude `*.pb.go` (go-gitea#30461) Fix network error when open/close organization/individual projects and redirect to project page (go-gitea#30387) Avoid losing token when updating mirror settings (go-gitea#30429) Fix label rendering (go-gitea#30456) Add comment for ContainsRedirectURI about the exact match (go-gitea#30457) Update JS and PY deps, lock eslint and related plugins (go-gitea#30452) Refactor cache and disable go-chi cache (go-gitea#30417) Fix admin notice view-detail (go-gitea#30450) Fix mirror error when mirror repo is empty (go-gitea#30432) Add `/public/assets/img/webpack` to ignore files again (go-gitea#30451) Lock a few tool dependencies to major versions (go-gitea#30439) Fix commit status cache which missed target_url (go-gitea#30426) Remove jQuery from the commit graph (except Fomantic) (go-gitea#30395) Fix rename branch 500 when the target branch is deleted but exist in database (go-gitea#30430) Limit the max line length when parsing git grep output (go-gitea#30418) Change the default maxPerPage for gitbucket (go-gitea#30392) Fix the spacing issue in the Project view (go-gitea#30415) Add commit status summary table to reduce query from commit status table (go-gitea#30223) Split `issue edit` code from `repo-legacy.js` into its own file (go-gitea#30419) Check the token's owner and repository when registering a runner (go-gitea#30406) ...

modify margin

9f063ce

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 11, 2024

pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 11, 2024

github-actions bot added the modifies/templates This PR modifies the template files label Apr 11, 2024

HEREYUA changed the title ~~Fix the spacing issue in the Project view interface~~ Fix the spacing issue in the Project view Apr 11, 2024

silverwind approved these changes Apr 11, 2024

View reviewed changes

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 Apr 11, 2024

silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label Apr 11, 2024

lunny approved these changes Apr 11, 2024

View reviewed changes

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 Apr 11, 2024

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2024

silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2024

lunny added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Apr 11, 2024

HEREYUA added 2 commits April 11, 2024 20:34

fix

7429b13

fix

f9ebfa4

pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 11, 2024

HEREYUA added 2 commits April 11, 2024 20:41

fix

819e803

fix lint

5c5bb92

silverwind approved these changes Apr 11, 2024

View reviewed changes

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 12, 2024

Merge branch 'main' into fix/modify_project_navbar_margin

2b2a465

lunny enabled auto-merge (squash) April 12, 2024 01:35

Merge branch 'main' into fix/modify_project_navbar_margin

4c0bcd5

lunny merged commit e8a99c8 into go-gitea:main Apr 12, 2024
26 checks passed

GiteaBot added this to the 1.23.0 milestone Apr 12, 2024

GiteaBot mentioned this pull request Apr 12, 2024

Fix the spacing issue in the Project view (#30415) #30423

Merged

GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Apr 12, 2024

wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024

go-gitea locked as resolved and limited conversation to collaborators Jul 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the spacing issue in the Project view #30415

Fix the spacing issue in the Project view #30415

HEREYUA commented Apr 11, 2024 •

edited by silverwind

Loading

silverwind left a comment •

edited

Loading

silverwind commented Apr 11, 2024

HEREYUA commented Apr 11, 2024 •

edited

Loading

silverwind commented Apr 11, 2024

HEREYUA commented Apr 11, 2024

yp05327 commented Apr 12, 2024

silverwind commented Apr 12, 2024 •

edited

Loading

HEREYUA commented Apr 12, 2024

silverwind commented Apr 12, 2024 •

edited

Loading

Fix the spacing issue in the Project view #30415

Fix the spacing issue in the Project view #30415

Conversation

HEREYUA commented Apr 11, 2024 • edited by silverwind Loading

silverwind left a comment • edited Loading

Choose a reason for hiding this comment

silverwind commented Apr 11, 2024

HEREYUA commented Apr 11, 2024 • edited Loading

silverwind commented Apr 11, 2024

HEREYUA commented Apr 11, 2024

yp05327 commented Apr 12, 2024

silverwind commented Apr 12, 2024 • edited Loading

HEREYUA commented Apr 12, 2024

silverwind commented Apr 12, 2024 • edited Loading

HEREYUA commented Apr 11, 2024 •

edited by silverwind

Loading

silverwind left a comment •

edited

Loading

HEREYUA commented Apr 11, 2024 •

edited

Loading

silverwind commented Apr 12, 2024 •

edited

Loading

silverwind commented Apr 12, 2024 •

edited

Loading