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

fixes jumping lines #4782

Merged
merged 6 commits into from Oct 29, 2022
Merged

fixes jumping lines #4782

merged 6 commits into from Oct 29, 2022

Conversation

math-GH
Copy link
Contributor

@math-GH math-GH commented Oct 27, 2022

Closes #4698

hopefully I fix the issue on the root.
Unfortunately I had to use line-height with rem unit.

Pull request checklist:

  • clear commit messages
  • code manually tested

@math-GH math-GH added the UI 🎨 User Interfaces label Oct 27, 2022
@math-GH math-GH added this to the 1.20.1 milestone Oct 27, 2022
@math-GH math-GH mentioned this pull request Oct 27, 2022
@Alkarex
Copy link
Member

Alkarex commented Oct 27, 2022

Nord theme is still jumping for me (Firefox and Chrome on Windows 10, 100%), all the other themes are better again 👍🏻
@Alwaysin Can you give it a try?

@Alwaysin
Copy link
Contributor

Nord theme is still jumping for me (Firefox on Windows 10, 100%), all the other themes are better again 👍🏻 @Alwaysin Can you give it a try?

I have troubles applying the patch:

 # curl -L https://github.com/FreshRSS/FreshRSS/pull/4782.patch -s | git apply
error: patch failed: p/themes/Swage/swage.css:149
error: p/themes/Swage/swage.css: patch does not apply
error: patch failed: p/themes/Swage/swage.rtl.css:149
error: p/themes/Swage/swage.rtl.css: patch does not apply

@Alwaysin
Copy link
Contributor

Alwaysin commented Oct 28, 2022

I got it working by going back to a previous commit. I didn't browse through all the themes but it looks good to me! (origine-compact, flat, pafat, and even nord)

@aledeg
Copy link
Member

aledeg commented Oct 28, 2022

Thank you @Alwaysin for your tests! That's appreciated.

@Alkarex
Copy link
Member

Alkarex commented Oct 28, 2022

I have troubles applying the patch

@Alwaysin If you have checked out FreshRSS by git, the easiest is to continue using git for trying features and going back

# Get back to clean edge
git fetch --all --prune
git reset --hard upstream/edge
# Apply a patch
git pull https://github.com/math-GH/FreshRSS.git fix-jumping-lines

(Using the convention that upstream/edge is https://github.com/FreshRSS/FreshRSS.git and origin/edge is your own https://github.com/Alwaysin/FreshRSS.git , otherwise adapt the name of the remote accordingly)

Command-line tips can be found at the bottom of GitHub pull requests:

image

@Alwaysin
Copy link
Contributor

Thanks for the info @Alkarex. I indeed am on git and it usually works with curl -L [...].patch | git apply. I fint it easier to get the changes this way but it looks like the fix merged earlier on Swage theme is not included here hence the conflict.

I think you need to have specific rights to see wht is on your screenshot, I don't see this. But the instructions otherwise work though!

@math-GH
Copy link
Contributor Author

math-GH commented Oct 29, 2022

I fixed hopefully everything.

@math-GH
Copy link
Contributor Author

math-GH commented Oct 29, 2022

This PR made an issue with BlueLagoon theme visible. Please merge #4786 before

@Alkarex Alkarex merged commit 270828a into FreshRSS:edge Oct 29, 2022
@math-GH math-GH deleted the fix-jumping-lines branch October 29, 2022 10:31
math-GH added a commit to math-GH/FreshRSS that referenced this pull request Nov 15, 2022
* fixes

* fix template

* fix frss.css

* fix Nord theme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Regression: lines jumping
4 participants