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

Colorize many things #1285

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Colorize many things #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b388ae
Grant Style to "Trending" Tab (#1284)
koumaza Dec 24, 2020
fdd9897
Rebase master (#3)
koumaza Jan 14, 2021
1190f68
Colorize UnderLineNav Text when hover
koumaza Jan 14, 2021
d351b89
Colorize GH Circlebadge
the-j0k3r Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion github-custom-fonts.user.css
View file
Open in desktop
@@ -1,7 +1,7 @@
/* ==UserStyle==
@name GitHub Custom Fonts
@namespace StylishThemes
@version 4.2.130
@version 4.2.144
Copy link
Member

Choose a reason for hiding this comment

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

dont bump versions pls

Copy link
Member

Choose a reason for hiding this comment

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

This will cause conflicts at merge.

Copy link
Contributor Author

@koumaza koumaza Feb 12, 2021 •
edited

Choose a reason for hiding this comment

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

This Bumpup was when rebased from Master.
I think to merge Master and version together.
It is okay?

Copy link
Member

@the-j0k3r the-j0k3r Feb 12, 2021 •
edited

Choose a reason for hiding this comment

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

IDK how you rebased, but a proper rebase wouldn't introduce changes that you haven't added manually.

lets assume you setup an upstream (named) remote when you forked this repo. if not replace upstream with the name or your remote.

run git pull --rebase upstream master then followed by git push --force

That should be round about it. assuming that you deleted this rebase commit =)

@homepageURL https://github.com/StylishThemes/GitHub-Dark
@updateURL https://stylishthemes.github.io/GitHub-Dark/github-custom-fonts.user.css
@license BSD-2-Clause
Expand Down