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

Copy code-icon.svg to near where it is used #19889

Merged
merged 2 commits into from
Feb 7, 2017
Merged

Conversation

chrmarti
Copy link
Collaborator

@chrmarti chrmarti commented Feb 4, 2017

@joaomoreno Please take a look (fixes #19541)

@chrmarti chrmarti added this to the February 2017 milestone Feb 4, 2017
@chrmarti chrmarti self-assigned this Feb 4, 2017
@chrmarti chrmarti requested a review from joaomoreno February 4, 2017 00:27
Copy link
Member

@joaomoreno joaomoreno left a comment

Choose a reason for hiding this comment

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

I meant it as: literally commit a copy of that file, leaving the original untouched.

This is as bad now, since the build needs to understand src/vs/workbench/parts/welcome.

@chrmarti
Copy link
Collaborator Author

chrmarti commented Feb 6, 2017

@joaomoreno Could you be more specific what needs to be done here?

@joaomoreno
Copy link
Member

Sure, sorry if I was ambiguous.

cp resources/code-icon.svg src/vs/workbench/parts/welcome/page/electron-browser
cp resources/code-icon.svg src/vs/workbench/parts/welcome/walkThrough/electron-browser

And then change both references

background-image: url('../../../../../../../resources/code-icon.svg');

to

background-image: url('code-icon.svg');

@chrmarti
Copy link
Collaborator Author

chrmarti commented Feb 6, 2017

@joaomoreno Got it: I'll do that in the distro repo, right? Also: I can move them since they are only used for the welcome ux. And: src/vs/workbench/parts/welcome would probably be ok, so I can share it between the two subfolders?

@chrmarti chrmarti requested a review from joaomoreno February 6, 2017 18:44
@joaomoreno
Copy link
Member

joaomoreno commented Feb 7, 2017

Now I understand why the current solution is as is! And the fix likewise! The icon is in the distro repo!

I'm more in favour of using a meaningful icon for each of the features instead of the product icon. From https://vsicons.azurewebsites.net/, the VSTS Bowtie Icon Font collection, I suggest the following icons:

  • For the Welcome, search for alert. The second icon, which is a flag, would do the trick. Alternatively, maybe devices or globe?
  • For the interactive playground, search for run. Any of those play button icons should work perfectly. Alternatively the log icon is pretty good too.

What do you think?

It would be great to have a solution which isn't hacky, scales and doesn't make the build work even more.

@chrmarti
Copy link
Collaborator Author

chrmarti commented Feb 7, 2017

@joaomoreno Let's fix the technical issue first and discuss the icon choice later. The only additional "work" the build does with this is to overwrite the icon as part of its existing mixin step. (Not sure which part you consider hacky.)

@joaomoreno
Copy link
Member

joaomoreno commented Feb 7, 2017

The more the build knows about the internals of src, the harder it becomes to maintain, fix and refactor in the future. Also, the more we put into the distro repo, the harder it becomes to maintain.

Personally I feel using the app icon in these features is wrong. Following that thought just happens to fix the technical issue, so I decided to write it down.

If you still feel that using the app icon is the right way, here's what you can do:

The mixin code will mix everything under quality/$QUALITY into the sources. So, you can just copy the OSS svg icons into src/vs/workbench/parts/welcome/page/electron-browser et al. Then, in the distro repo, you can copy both the insider and stable icons into quality/$QUALITY/src/vs/workbench/parts/welcome/page/electron-browser, et al. They should get overwritten during the build.

@chrmarti
Copy link
Collaborator Author

chrmarti commented Feb 7, 2017

I already do what you suggest (except I placed the icon at src/vs/workbench/parts/welcome). I reverted the change to gulpfile.mixin.js in my second commit. I'll just merge that since it seems pretty clean. I've opened #20131 for revisiting the icons.

@chrmarti chrmarti merged commit feebefb into master Feb 7, 2017
@joaomoreno joaomoreno deleted the chrmarti/19541-2 branch February 7, 2017 16:01
@joaomoreno
Copy link
Member

joaomoreno commented Feb 7, 2017

Cool. I just don't see the matching VS icon in the matching folder in the insiders and stable qualities, in the distro repo.

@chrmarti
Copy link
Collaborator Author

chrmarti commented Feb 7, 2017

Hah! I better merge that from my private branch, thanks! :)

@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[WelcomeUX] Copy code-icon.svg to near where it's used
3 participants