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 divider in subscription page #27298

Merged
merged 3 commits into from
Sep 27, 2023
Merged

Fix divider in subscription page #27298

merged 3 commits into from
Sep 27, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Sep 27, 2023 •
edited
Loading

divider should always display in subscription page.

Before:
image
image

After:
(no changes when there's no subscriptions)
image
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 27, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 27, 2023
@yp05327 yp05327 added the topic/ui Change the appearance of the Gitea UI label Sep 27, 2023
@techknowlogick techknowlogick added the backport/v1.21 This PR should be backported to Gitea 1.21 label Sep 27, 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 Sep 27, 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 Sep 27, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 27, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) September 27, 2023 03:30
@techknowlogick techknowlogick merged commit 5ef5a0a into go-gitea:main Sep 27, 2023
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 27, 2023
@GiteaBot GiteaBot mentioned this pull request Sep 27, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 27, 2023
@yp05327 @techknowlogick @GiteaBot
Fix divider in subscription page (go-gitea#27298)
934e573 
the divider should always display in the subscription page.

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
@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 Sep 27, 2023
@yp05327 yp05327 deleted the fix-divider-in-subscription-page branch September 28, 2023 02:00
lunny pushed a commit that referenced this pull request Sep 28, 2023
@GiteaBot @yp05327 @techknowlogick
Fix divider in subscription page (#27298) (#27301)
77ccd21 
Backport #27298 by @yp05327

divider should always display in subscription page.

Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/5a5c948c-8e45-4faa-827e-a05356f3a714)

![image](https://github.com/go-gitea/gitea/assets/18380374/8f6a6747-5414-45cc-8b4c-aa99ea869038)


After:
(no changes when there's no subscriptions)

![image](https://github.com/go-gitea/gitea/assets/18380374/261faf8d-97e2-4d79-a255-5077a42979d2)

![image](https://github.com/go-gitea/gitea/assets/18380374/fc73c837-2efb-40b2-a8f8-2b5c77c32f3b)

Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 28, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
7bf3179 
* giteaoffical/main: (22 commits)
  Fix review UI (go-gitea#27322)
  Improve issue history dialog and make poster can delete their own history (go-gitea#27323)
  Improve branch list UI (go-gitea#27319)
  doctor: delete action entries without existing user (go-gitea#27292)
  fix orphan check for deleted branch (go-gitea#27310)
  make writing main test easier (go-gitea#27270)
  [skip ci] Updated translations via Crowdin
  Fix protected branch icon location (go-gitea#26576)
  move the `gitea admin` subcommands into separate files (go-gitea#27307)
  Fix chinese translation (go-gitea#27296)
  bump bleve (go-gitea#27300)
  Redefine the meaning of column is_active to make Actions Registration Token generation easier (go-gitea#27143)
  Use vitest globals (go-gitea#27102)
  Fix divider in subscription page (go-gitea#27298)
  Fix yaml test (go-gitea#27297)
  Enable production source maps for index.js, fix CSS sourcemaps (go-gitea#27291)
  Fix some animation bugs (go-gitea#27287)
  Add missed return to actions view fetch (go-gitea#27289)
  Fix more yaml lint errors (go-gitea#27284)
  Fix incorrect change from go-gitea#27231 (go-gitea#27275)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@techknowlogick techknowlogick techknowlogick 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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.
4 participants
@yp05327 @lunny @techknowlogick @GiteaBot