Update font variables to use system font stack #1266

Open

Suyun114 wants to merge 1 commit from Suyun114/system-font-stack into master

Suyun114 commented

2025-06-11 05:59:33 -04:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

src/sass/include/_variables.scss
src/sass/index.scss
src/sass/inputs.scss
src/sass/tweet/_base.scss

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Update font variables to use system font stack' (#1266) from Suyun114/system-font-stack into master

Merge commit body

Reviewed-on: https://git.merrycorps.xyz/PAS/nitter/pulls/1266

Merge pull request 'Update font variables to use system font stack' (#1266) from Suyun114/system-font-stack into master

Reviewed-on: https://git.merrycorps.xyz/PAS/nitter/pulls/1266

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Suyun114/system-font-stack:Suyun114/system-font-stack

git switch Suyun114/system-font-stack

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff Suyun114/system-font-stack

git switch Suyun114/system-font-stack

git rebase master

git switch master

git merge --ff-only Suyun114/system-font-stack

git switch Suyun114/system-font-stack

git rebase master

git switch master

git merge --no-ff Suyun114/system-font-stack

git switch master

git merge --squash Suyun114/system-font-stack