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

Use vertical layout for multiple code expander buttons #31122

Merged
merged 4 commits into from
May 29, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented May 27, 2024

Fixes: #31068

  • Now it only does a single call to GetExpandDirection per line instead of multiples.
  • Exposed data-expand-direction to frontend so it can correctly size the buttons (it's a pain to do in tables).
Screenshot 2024-05-27 at 20 44 56 Screenshot 2024-05-27 at 20 44 51 Screenshot 2024-05-27 at 20 44 46 Screenshot 2024-05-27 at 20 44 33 Screenshot 2024-05-27 at 20 44 26 Screenshot 2024-05-27 at 20 44 20

Would backport as trivial enhancement.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 27, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 27, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label May 27, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 27, 2024
web_src/css/review.css Outdated Show resolved Hide resolved
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label May 27, 2024
@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 May 27, 2024
@lunny
Copy link
Member

lunny commented May 28, 2024

Looks like the line number is not right.
image

@silverwind
Copy link
Member Author

silverwind commented May 28, 2024

Looks like the line number is not right. image

Can't be related to this PR, but this seems similar to #29498 which I thought I had fixed already.

If you can reproduce on demo, please open a new issue for that.

@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 May 28, 2024
@lunny
Copy link
Member

lunny commented May 29, 2024

I created another issue to record it. #31149

@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 29, 2024
@lunny lunny enabled auto-merge (squash) May 29, 2024 03:36
@lunny lunny merged commit 7034efc into go-gitea:main May 29, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 29, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 29, 2024
Fixes: go-gitea#31068

- Now it only does a single call to `GetExpandDirection` per line
instead of multiples.
- Exposed `data-expand-direction` to frontend so it can correctly size
the buttons (it's a pain to do in tables).

<img width="142" alt="Screenshot 2024-05-27 at 20 44 56"
src="https://github.com/go-gitea/gitea/assets/115237/8b0b45a6-8e50-4081-8822-5e0775d8d941">
<img width="142" alt="Screenshot 2024-05-27 at 20 44 51"
src="https://github.com/go-gitea/gitea/assets/115237/b7ba2c57-8f55-4e9f-9606-c96d16b77892">
<img width="132" alt="Screenshot 2024-05-27 at 20 44 46"
src="https://github.com/go-gitea/gitea/assets/115237/0e838fb8-5e8c-4250-9843-a68b88d5418b">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 33"
src="https://github.com/go-gitea/gitea/assets/115237/da6c7f83-c160-4389-8ab2-889d0568cbe8">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 26"
src="https://github.com/go-gitea/gitea/assets/115237/cdb490b2-5040-484a-92e5-46fc5e37c199">
<img width="78" alt="Screenshot 2024-05-27 at 20 44 20"
src="https://github.com/go-gitea/gitea/assets/115237/d2978ab0-764e-41ff-922c-25f8fe749f28">

Would backport as trivial enhancement.
@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 May 29, 2024
@silverwind silverwind deleted the codex branch May 29, 2024 07:06
silverwind added a commit that referenced this pull request May 29, 2024
Backport #31122 by @silverwind

Fixes: #31068

- Now it only does a single call to `GetExpandDirection` per line
instead of multiples.
- Exposed `data-expand-direction` to frontend so it can correctly size
the buttons (it's a pain to do in tables).

<img width="142" alt="Screenshot 2024-05-27 at 20 44 56"
src="https://github.com/go-gitea/gitea/assets/115237/8b0b45a6-8e50-4081-8822-5e0775d8d941">
<img width="142" alt="Screenshot 2024-05-27 at 20 44 51"
src="https://github.com/go-gitea/gitea/assets/115237/b7ba2c57-8f55-4e9f-9606-c96d16b77892">
<img width="132" alt="Screenshot 2024-05-27 at 20 44 46"
src="https://github.com/go-gitea/gitea/assets/115237/0e838fb8-5e8c-4250-9843-a68b88d5418b">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 33"
src="https://github.com/go-gitea/gitea/assets/115237/da6c7f83-c160-4389-8ab2-889d0568cbe8">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 26"
src="https://github.com/go-gitea/gitea/assets/115237/cdb490b2-5040-484a-92e5-46fc5e37c199">
<img width="78" alt="Screenshot 2024-05-27 at 20 44 20"
src="https://github.com/go-gitea/gitea/assets/115237/d2978ab0-764e-41ff-922c-25f8fe749f28">

Would backport as trivial enhancement.

Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 30, 2024
* giteaofficial/main: (30 commits)
  Azure blob storage support (go-gitea#30995)
  Use repo as of renderctx's member rather than a repoPath on metas (go-gitea#29222)
  Ignore FindRecentlyPushedNewBranches err (go-gitea#31164)
  [skip ci] Updated translations via Crowdin
  Fix markup preview (go-gitea#31158)
  Swap word order in Comment and Close (go-gitea#31148)
  Fix push multiple branches error with tests (go-gitea#31151)
  Use vertical layout for multiple code expander buttons (go-gitea#31122)
  Remove duplicate `ProxyPreserveHost` in Apache httpd doc (go-gitea#31143)
  [skip ci] Updated translations via Crowdin
  Add an immutable tarball link to archive download headers for Nix (go-gitea#31139)
  Improve mobile review ui (go-gitea#31091)
  Add topics for repository API (go-gitea#31127)
  Add missed return after `ctx.ServerError` (go-gitea#31130)
  Fix API repository object format missed (go-gitea#31118)
  Fix DashboardRepoList margin (go-gitea#31121)
  Update JS dependencies (go-gitea#31120)
  [skip ci] Updated translations via Crowdin
  Prevent simultaneous editing of comments and issues (go-gitea#31053)
  Update demo site location from try.gitea.io -> demo.gitea.com (go-gitea#31054)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show more lines button seems have two styles?
5 participants