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 code fold icons with octicons #12222

Merged
merged 2 commits into from
Jul 13, 2020
Merged

Replace code fold icons with octicons #12222

merged 2 commits into from
Jul 13, 2020

Conversation

silverwind
Copy link
Member

  • replace font-awesome icons with octicons
  • clean up js and css surrounding the code expansion and file folding
  • fix hover color on arc-green

before:

image

after:

image

blob_excerpt.tmpl was re-indented, so best viewed with whitespace hidden in the diff.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 12, 2020
@lafriks lafriks added the topic/ui Change the appearance of the Gitea UI label Jul 12, 2020
@lafriks lafriks added this to the 1.13.0 milestone Jul 12, 2020
@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 Jul 12, 2020
@silverwind
Copy link
Member Author

silverwind commented Jul 12, 2020 •
edited
Loading

One more tweak pushed, bg hover effect on the fold buttons:

image

image

Also fixed background on fold line in gitea theme which was reddish for some reason.

Before:
image

After:
image

@silverwind
Copy link
Member Author

Doing a few more color tweaks, don't merge yet.

@silverwind
Copy link
Member Author

Line number column colors tweaked and also incread vertical padding on fold line a bit:

image

image

@silverwind
Copy link
Member Author

Should be good to go now.

@lafriks
Copy link
Member

lafriks commented Jul 12, 2020

Please resolve conflicts

@silverwind
Replace code fold icons with octicons
b1a16aa 
- replace font-awesome icons with octicons
- clean up js and css surrounding the code expansion and file folding
- fix hover color on arc-green
- tweak diff line number colors
@silverwind
Copy link
Member Author

rebased

@lafriks
Copy link
Member

lafriks commented Jul 13, 2020

🚀

@lafriks lafriks merged commit 84a419d into go-gitea:master Jul 13, 2020
@silverwind silverwind deleted the foldsvg branch July 13, 2020 14:26
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@mrsdizzie mrsdizzie mrsdizzie 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. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@silverwind @lafriks @mrsdizzie @GiteaBot @zeripath