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

Use flex-container for repo and org settings #27418

Merged
merged 2 commits into from
Oct 4, 2023
Merged

Use flex-container for repo and org settings #27418

merged 2 commits into from
Oct 4, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Oct 3, 2023 •
edited
Loading

Same as #26046 but for repo and org settings pages, reducing the margins between the boxes:

Screenshot 2023-10-03 at 23 25 19 Screenshot 2023-10-03 at 23 27 12

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 3, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 3, 2023
@github-actions github-actions bot added the topic/ui Change the appearance of the Gitea UI label Oct 3, 2023
@silverwind silverwind added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.21 This PR should be backported to Gitea 1.21 labels Oct 3, 2023
@lunny lunny added this to the 1.22.0 milestone Oct 4, 2023
@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 Oct 4, 2023
@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 Oct 4, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 4, 2023
@silverwind silverwind merged commit cbc0b73 into go-gitea:main Oct 4, 2023
24 checks passed
@silverwind silverwind deleted the repoorgflex branch October 4, 2023 06:47
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Oct 4, 2023
@silverwind @GiteaBot
Use flex-container for repo and org settings (go-gitea#27418)
951f5d1 
Same as go-gitea#26046 but for repo and
org settings pages, reducing the margins between the boxes:

<img width="1247" alt="Screenshot 2023-10-03 at 23 25 19"
src="https://github.com/go-gitea/gitea/assets/115237/4e68ad5e-5fdc-4466-aefb-ec71bf411d45">
<img width="1255" alt="Screenshot 2023-10-03 at 23 27 12"
src="https://github.com/go-gitea/gitea/assets/115237/9068369b-a75d-401e-8b8d-3bd4bbe097dc">

Co-authored-by: Giteabot <[email protected]>
@GiteaBot GiteaBot mentioned this pull request Oct 4, 2023
Merged
@GiteaBot 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 Oct 4, 2023
silverwind added a commit that referenced this pull request Oct 4, 2023
@GiteaBot @silverwind
Use flex-container for repo and org settings (#27418) (#27430)
1dd84ec 
Backport #27418 by @silverwind

Same as #26046 but for repo and
org settings pages, reducing the margins between the boxes:

<img width="1247" alt="Screenshot 2023-10-03 at 23 25 19"
src="https://github.com/go-gitea/gitea/assets/115237/4e68ad5e-5fdc-4466-aefb-ec71bf411d45">
<img width="1255" alt="Screenshot 2023-10-03 at 23 27 12"
src="https://github.com/go-gitea/gitea/assets/115237/9068369b-a75d-401e-8b8d-3bd4bbe097dc">

Co-authored-by: silverwind <[email protected]>
silverwind added a commit to silverwind/gitea that referenced this pull request Oct 4, 2023
@silverwind
Merge main, rename to gitea-auto
454e475 
* origin/main:
  When comparing with an non-exist repository, return 404 but 500 (go-gitea#27437)
  Fix pr template (go-gitea#27436)
  Use minimal required version on CI and remove unnecessary services (go-gitea#27429)
  Fix  missing `ctx`  in new_form.tmpl  (go-gitea#27434)
  Use flex-container for repo and org settings (go-gitea#27418)
  Fix yet another `ctx` template bug (go-gitea#27417)
  Add Index to `action.user_id` (go-gitea#27403)
  [skip ci] Updated translations via Crowdin
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Dec 24, 2023
@wxiaoguang
Revert "Use flex-container for repo and org settings (go-gitea#27418)"
b12c0cc 
This reverts commit cbc0b73.
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@denyskon denyskon denyskon approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 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
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@silverwind @lunny @denyskon @delvh @GiteaBot