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

Update the puppet icon(s) #72

Merged
merged 1 commit into from
Dec 20, 2021
Merged

Conversation

dhollinger
Copy link
Contributor

@dhollinger dhollinger commented Aug 13, 2021

Updated the Puppet icon and color and added the same for Puppet .epp files

This is dependent on the following PR in ryanoasis/nerd-fonts: ryanoasis/nerd-fonts#652

@kyazdani42
Copy link
Member

should we merge this now or wait for the related PR to be merged ?

@dhollinger
Copy link
Contributor Author

I would wait until the related PR is merged. Otherwise, users will end up with a Horizontal line/rule instead of an icon.

@dhollinger
Copy link
Contributor Author

@kyazdani42 Just to keep this from falling into the nether - still waiting on nerdfonts to merge the related PR. Just pinged @ryanoasis again on it. He appears to have looked at the PR and thumbs upped it, but not review or merge yet.

@ryanoasis
Copy link

I replied. Trying to catch up. Thanks!

@dhollinger
Copy link
Contributor Author

@kyazdani42 ryanoasis/nerd-fonts#652 was merged last month. I fixed the merge conflicts and this can be merged anytime you are ready

@@ -1373,4 +1377,3 @@ return {
has_loaded = function() return loaded end,
get_icons = function() return icons end,
set_up_highlights = set_up_highlights,
}
Copy link
Member

Choose a reason for hiding this comment

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

just remove that diff and we'll be good to go then :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be fixed now.

@kyazdani42 kyazdani42 merged commit ac71ca8 into nvim-tree:master Dec 20, 2021
@dhollinger dhollinger deleted the puppet_icon branch December 20, 2021 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants