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

Reintroduce Octicons file-symlink-directory #1215

Merged
merged 2 commits into from
May 10, 2023
Merged

Conversation

Finii
Copy link
Collaborator

@Finii Finii commented May 8, 2023

Description

This commit re-introduces the oct-file_symlink_directoty icon we dropped with v3.0.0.
It was dropped, because we updated Octicons and THEY dropped it.

As that is used for example by lsd and is (was) the only icon that depicts a symlink directory:

  • Create a new icon by hand as mix from Octicons directory and symlink-file icons.
  • Sneak that into the Octicons set with the usual (previous) codepoint
  • Move the glyph we had on that codepoint to the end of Octicons

Requirements / Checklist

What does this Pull Request (PR) do?

How should this be manually tested?

Any background context you can provide?

primer/octicons#945
https://github.com/lsd-rs/lsd/blob/2fe3fcdd3564836962eab8ba6b1444996fe24e1e/src/theme/icon.rs#L85

What are the relevant tickets (if any)?

Fixes: #1213

Screenshots (if appropriate or helpful)

@Finii Finii added this to the v3.0.1 milestone May 8, 2023
@Finii Finii force-pushed the feature/keep-symlink-dir branch from c920ff3 to 2fb1df9 Compare May 8, 2023 11:33
Finii added 2 commits May 10, 2023 12:49
[why]
Some people, for example the `lsd` project, need an icon with a symlink
directory. That has been dropped by Octicons. Our repacking put some
unrelated bookmark icon on that codepoint; but even an empty glyph would
be not ideal.

[how]
Design a file-symlink-directory from file-symlink-file and
file-directory. In this way it fits nicely into the current design of
Octicons.

Sneak that into the unpacked Octicons archive.
Adapt mapping manually to keep as much as possible constant.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
Just run ./generate.

Compare commit
  7764e05  Create new octicons.ttf (update to v18.3.0) (2/2)

Fixes: 1213

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
@Finii Finii force-pushed the feature/keep-symlink-dir branch from 2fb1df9 to 9f54f24 Compare May 10, 2023 10:50
@Finii Finii merged commit 0ffd457 into master May 10, 2023
@Finii Finii deleted the feature/keep-symlink-dir branch May 10, 2023 10:59
LNKLEO pushed a commit to LNKLEO/Nerd that referenced this pull request Nov 24, 2023
…-dir [skip ci]

Reintroduce Octicons file-symlink-directory
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.

f482 went from symlink directory to bookmark slash?
1 participant