Skip to content

Merge and tweak markup editor expander CSS #34409

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
Merged
merged 8 commits into from
May 9, 2025
Merged

Merge and tweak markup editor expander CSS #34409

merged 8 commits into from
May 9, 2025

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented May 9, 2025 •
edited
Loading

  • Merge the CSS for the two expanders (text-expander-element and tribute.js) into one file
  • Fix overflow issues
  • Remove min-width
  • Various other tweaks like borders, colors, padding, gaps.

text-expander:

Screenshot 2025-05-09 at 02 21 24

tribute:

Screenshot 2025-05-09 at 02 21 37

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 9, 2025
@silverwind
Copy link
Member Author

silverwind commented May 9, 2025 •
edited
Loading

After latest tweaks:

Screenshot 2025-05-09 at 02 39 57 Screenshot 2025-05-09 at 02 40 06

wxiaoguang
wxiaoguang approved these changes May 9, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

Maybe "overflow: hidden or ellipsis" is better than the wrapped lines.

@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 9, 2025
@lunny lunny added this to the 1.25.0 milestone May 9, 2025
@lunny lunny added the topic/ui Change the appearance of the Gitea UI label May 9, 2025
@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 9, 2025
@silverwind
Copy link
Member Author

Maybe "overflow: hidden or ellipsis" is better than the wrapped lines.

I guess we could. User display name is limited to something like 50 chars and wrap looks kind of ugly. I will change it.

@silverwind silverwind marked this pull request as draft May 9, 2025 10:38
@silverwind
Copy link
Member Author

Ellipsis added:

image

@silverwind silverwind marked this pull request as ready for review May 9, 2025 14:18
@silverwind silverwind requested a review from wxiaoguang May 9, 2025 14:18
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels May 9, 2025
@silverwind silverwind added the backport/v1.24 This PR should be backported to Gitea 1.24 label May 9, 2025
@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 9, 2025
@silverwind silverwind merged commit 8b16ab7 into go-gitea:main May 9, 2025
26 checks passed
@silverwind silverwind deleted the expandercss branch May 9, 2025 15:14
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 9, 2025
@silverwind @wxiaoguang @GiteaBot
Merge and tweak markup editor expander CSS (go-gitea#34409)
a3e5ed8 
- Merge the CSS for the two expanders (text-expander-element and
tribute.js) into one file
- Fix overflow issues
- Remove min-width
- Various other tweaks like borders, colors, padding, gaps.

text-expander:

<img width="645" alt="Screenshot 2025-05-09 at 02 21 24"
src="https://github.com/user-attachments/assets/33276dc4-38e8-45e1-8216-2a4baa9bc039"
/>

tribute:

<img width="624" alt="Screenshot 2025-05-09 at 02 21 37"
src="https://github.com/user-attachments/assets/91fbcd1a-9bfc-40fd-93f0-a05b4bd4c98d"
/>

---------

Co-authored-by: wxiaoguang <[email protected]>
@GiteaBot GiteaBot mentioned this pull request May 9, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 9, 2025
silverwind added a commit that referenced this pull request May 9, 2025
@GiteaBot @silverwind @wxiaoguang
Merge and tweak markup editor expander CSS (#34409) (#34415)
38cc745 
Backport #34409 by @silverwind

- Merge the CSS for the two expanders (text-expander-element and
tribute.js) into one file
- Fix overflow issues
- Remove min-width
- Various other tweaks like borders, colors, padding, gaps.

text-expander:

<img width="645" alt="Screenshot 2025-05-09 at 02 21 24"
src="https://github.com/user-attachments/assets/33276dc4-38e8-45e1-8216-2a4baa9bc039"
/>

tribute:

<img width="624" alt="Screenshot 2025-05-09 at 02 21 37"
src="https://github.com/user-attachments/assets/91fbcd1a-9bfc-40fd-93f0-a05b4bd4c98d"
/>

Co-authored-by: silverwind <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 12, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d536882 
* giteaofficial/main:
  Add a webhook push test for dev branch (go-gitea#34421)
  [skip ci] Updated translations via Crowdin
  Fix bug webhook milestone is not right. (go-gitea#34419)
  Only git operations should update `last changed` of a repository (go-gitea#34388)
  When updating comment, if the content is the same, just return and not update the databse (go-gitea#34422)
  Remove legacy template helper functions (go-gitea#34426)
  Fix GetUsersByEmails (go-gitea#34423)
  [skip ci] Updated translations via Crowdin
  Fix a bug when uploading file via lfs ssh command (go-gitea#34408)
  Merge and tweak markup editor expander CSS (go-gitea#34409)
  Bump `@github/relative-time-element` to v4.4.8 (go-gitea#34413)
  Refactor commit message rendering and fix bugs (go-gitea#34412)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/frontend topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.25.0
Development

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