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

Replace fomantic divider module with our own #25539

Merged
merged 13 commits into from
Jun 29, 2023
Merged

Replace fomantic divider module with our own #25539

merged 13 commits into from
Jun 29, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 27, 2023 •
edited
Loading

Should look exactly like before for normal dividers. "Horizontal" ones look better because they no longer use image backgrounds.

Screenshot 2023-06-27 at 19 07 56 Screenshot 2023-06-27 at 19 05 58 Screenshot 2023-06-27 at 19 00 42 Screenshot 2023-06-27 at 18 58 15 Screenshot 2023-06-27 at 18 56 22 Screenshot 2023-06-27 at 19 21 11

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 27, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 27, 2023
@silverwind silverwind added type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jun 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 Jun 27, 2023
@silverwind silverwind added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 27, 2023
@silverwind
Copy link
Member Author

silverwind commented Jun 27, 2023 •
edited
Loading

Adding backport because of the activity margin fixes and as it's a low-risk one.

@silverwind silverwind removed the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 27, 2023
@silverwind
Copy link
Member Author

Actually I don't think we need the backport, and it likely won't land cleanly.

HesterG
HesterG reviewed Jun 28, 2023
View reviewed changes
web_src/css/base.css Outdated Show resolved Hide resolved
@silverwind
Copy link
Member Author

Might want to also remove the ui class from them now.

@silverwind silverwind marked this pull request as draft June 28, 2023 06:08
@silverwind silverwind marked this pull request as ready for review June 28, 2023 17:24
@silverwind
Copy link
Member Author

Ready again.

@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 Jun 29, 2023
@silverwind
Copy link
Member Author

Might want to also remove the ui class from them now.

Forgot about this, will do this as well, I suppose.

@silverwind silverwind marked this pull request as draft June 29, 2023 03:12
@pull-request-size pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 29, 2023
@silverwind
Copy link
Member Author

ui class is now removed. additional fixes:

  • Renamed horizontal to divider-text. A much better fitting name imho
  • Improved activity history headers, reduced markup, moved on text block to tooltip
Screenshot 2023-06-29 at 06 13 48

I decided to keep the opinonated text-transform: uppercase on .divider-text for now. Reason being is that with all-lowercase text, the text would appear slightly off-center and afaik, this is not solveable via CSS only.

@silverwind silverwind marked this pull request as ready for review June 29, 2023 04:19
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 29, 2023
@lunny lunny merged commit 64f2d70 into go-gitea:main Jun 29, 2023
22 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 29, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 29, 2023
@silverwind silverwind deleted the divider branch June 29, 2023 12:42
sahinakkaya pushed a commit to sahinakkaya/gitea that referenced this pull request Jun 30, 2023
@silverwind @sahinakkaya
Cherry-pick 64f2d70 and resolve conflicts
3e156ab 
This commit was needed because some of the changes by 64f2d70 were
overwritten by me in previous merge commit. Details of 64f2d70 as
follows:

Replace fomantic divider module with our own (go-gitea#25539)

Should look exactly like before for normal dividers. "Horizontal" ones
look better because they no longer use image backgrounds.

<img width="917" alt="Screenshot 2023-06-27 at 19 07 56"
src="https://github.com/go-gitea/gitea/assets/115237/d97d8dec-6859-44a8-85ba-e4549b4dd9df">

<img width="914" alt="Screenshot 2023-06-27 at 19 05 58"
src="https://github.com/go-gitea/gitea/assets/115237/8bf98544-2d82-4ebf-ac68-d6dc237bd6b2">

<img width="1246" alt="Screenshot 2023-06-27 at 19 00 42"
src="https://github.com/go-gitea/gitea/assets/115237/36a6bb21-6029-4f53-8bee-535f55c66fed">

<img width="344" alt="Screenshot 2023-06-27 at 18 58 15"
src="https://github.com/go-gitea/gitea/assets/115237/a9e70aee-8e6b-4ea1-9e93-19c9f96aec6e">
<img width="823" alt="Screenshot 2023-06-27 at 18 56 22"
src="https://github.com/go-gitea/gitea/assets/115237/e7a497cd-f262-4683-8872-23c3c8cce32f">

<img width="330" alt="Screenshot 2023-06-27 at 19 21 11"
src="https://github.com/go-gitea/gitea/assets/115237/42f24149-a655-4c7e-bd26-8ab52db6446b">
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 2, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
346547b 
* giteaoffical/main: (89 commits)
  Move some files under repo/setting (go-gitea#25585)
  Following-up improvments for various PRs (go-gitea#25620)
  Set SSH_AUTHORIZED_KEYS_BACKUP to false (go-gitea#25412)
  Fix bug of branches API with tests (go-gitea#25578)
  [skip ci] Updated translations via Crowdin
  Application as a maintainer (go-gitea#25614)
  Adding  branch-name copy  to clipboard branches screen. (go-gitea#25596)
  Use AfterCommitId to get commit for Viewed functionality (go-gitea#25529)
  Fix branch commit message too long problem (go-gitea#25588)
  Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (go-gitea#25581)
  Add API for changing Avatars (go-gitea#25369)
  read-only checkboxes don't appear and don't entirely act the way one might expect (go-gitea#25573)
  Redirect to package after version deletion (go-gitea#25594)
  Update emoji set to Unicode 15 (go-gitea#25595)
  Fix `lint-swagger` action (go-gitea#25593)
  Replace fomantic divider module with our own (go-gitea#25539)
  Add documentation about supported workflow trigger events (go-gitea#25582)
  Sync branches into databases (go-gitea#22743)
  Fix milestones deletion (go-gitea#25583)
  Reduce table padding globally (go-gitea#25568)
  ...

# Conflicts:
#	templates/repo/wiki/revision.tmpl
@silverwind silverwind mentioned this pull request Aug 15, 2023
Merged
silverwind added a commit that referenced this pull request Aug 16, 2023
@silverwind
Use unique class for breadcrumb divider (#26524)
3e044d2 
Fix regression from #25539:
#26519 (comment).

Before:
<img width="429" alt="Screenshot 2023-08-15 at 15 46 12"
src="https://github.com/go-gitea/gitea/assets/115237/a818f60a-77a2-48fe-8e6f-363d152ccb1e">

After:
<img width="424" alt="Screenshot 2023-08-15 at 15 46 19"
src="https://github.com/go-gitea/gitea/assets/115237/c90159e2-ced2-4a74-8a0f-a1b2b5d0b565">

<img width="605" alt="Screenshot 2023-08-15 at 15 56 11"
src="https://github.com/go-gitea/gitea/assets/115237/3ded6f57-86f4-422a-86cb-56dd2c216dee">
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@HesterG HesterG HesterG approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.21.0
Development

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